chore(release): 2.0.1 [skip ci]

## [2.0.1](https://github.com/chenasraf/simple-scaffold/compare/v2.0.0...v2.0.1) (2024-02-02)

### Bug Fixes

* log level flag ([5d7f449](5d7f449050))
* rm tmp dir too early ([4aa52c8](4aa52c84bd))

.github/workflows/release.yml

@@ -31,8 +31,6 @@ jobs:
         run: pnpm test
       - name: Build Package
         run: pnpm build
-      - name: Pack
-        run: cd ./dist && pnpm pack --pack-destination=../
       - name: Semantic Release
         run: npx semantic-release
         env:

CHANGELOG.md

@@ -1,57 +1,21 @@
 # Change Log
 
-# [2.0.0](https://github.com/chenasraf/simple-scaffold/compare/v1.10.0...v2.0.0) (2024-01-31)
+## [2.0.1](https://github.com/chenasraf/simple-scaffold/compare/v2.0.0...v2.0.1) (2024-02-02)
 
 
+### Bug Fixes
+
+* log level flag ([5d7f449](https://github.com/chenasraf/simple-scaffold/commit/5d7f449050e50a6e4b2d00b7a2215cdb5fc9b611))
+* rm tmp dir too early ([4aa52c8](https://github.com/chenasraf/simple-scaffold/commit/4aa52c84bd8cf302031e9f7f6407466aa736beb7))
+
+# [2.0.0](https://github.com/chenasraf/simple-scaffold/compare/v1.9.0...v2.0.0) (2024-01-31)
+
 * fix!: version number ([bc0a18d](https://github.com/chenasraf/simple-scaffold/commit/bc0a18dce01fefec6187192cb20c9303f7f7dbfa))
-
-
-### BREAKING CHANGES
-
-* see changelog
-
-# [1.10.0](https://github.com/chenasraf/simple-scaffold/compare/v1.9.0...v1.10.0) (2024-01-31)
-
-
-### Bug Fixes
-
 * remove gh flag ([939200c](https://github.com/chenasraf/simple-scaffold/commit/939200c9f21be240485ea602a73b983ba2f47aaf))
 * tests ([ff92fd7](https://github.com/chenasraf/simple-scaffold/commit/ff92fd7607f1b86f36fc6b62652fdfc81cb391a3))
-
-
-### Features
-
 * try multiple default config files ([89aacb5](https://github.com/chenasraf/simple-scaffold/commit/89aacb58fd90a892f4994c758c61c43b2a6b1fba))
-
-# [1.10.0](https://github.com/chenasraf/simple-scaffold/compare/v1.9.0...v1.10.0) (2024-01-31)
-
-
-### Bug Fixes
-
-* remove gh flag ([939200c](https://github.com/chenasraf/simple-scaffold/commit/939200c9f21be240485ea602a73b983ba2f47aaf))
-* tests ([ff92fd7](https://github.com/chenasraf/simple-scaffold/commit/ff92fd7607f1b86f36fc6b62652fdfc81cb391a3))
-
-
-### Features
-
-* try multiple default config files ([89aacb5](https://github.com/chenasraf/simple-scaffold/commit/89aacb58fd90a892f4994c758c61c43b2a6b1fba))
-
-# [2.0.0-pre.3](https://github.com/chenasraf/simple-scaffold/compare/v2.0.0-pre.2...v2.0.0-pre.3) (2024-01-30)
-
-
-### Bug Fixes
-
-* tests ([c219d38](https://github.com/chenasraf/simple-scaffold/commit/c219d382e6df8b2ca1157544a7785f6645d04be2))
-
-## 2.0.0-pre.2 (2024-01-29)
-
 * Update README.md ([e012d51](https://github.com/chenasraf/simple-scaffold/commit/e012d51))
 * docs: fix readme doc links ([55e561b](https://github.com/chenasraf/simple-scaffold/commit/55e561b))
-
-
-
-## 2.0.0-pre.1 (2024-01-29)
-
 * chore: fix docs & formatting ([b4f0731](https://github.com/chenasraf/simple-scaffold/commit/b4f0731))
 * chore: update deps ([22ad5d4](https://github.com/chenasraf/simple-scaffold/commit/22ad5d4))
 * chore: update deps ([b2373aa](https://github.com/chenasraf/simple-scaffold/commit/b2373aa))

docs/docs/usage/migration.md

@@ -15,8 +15,7 @@ title: Migration
   - The `#template_file` syntax has been removed, you may use `--config` or `-c` to tell Simple
     Scaffold which file to look for inside the git project. There is a default file priority list
     which can find the file for you if it is in one of the supported filenames.
-- `verbose` can now take the names `debug`, `info`, `warn`, `error` or `none` (case insensitive) or
-  as usual by using the numbering from before.
+- `verbose` can now take the names `debug`, `info`, `warn`, `error` or `none` (case insensitive).
 - `--create-sub-folder` (`-s`) has been renamed to `--subdir` (`-s`) in the CLI. The Node.js names
   have been changed as well.
 - `--sub-folder-name-helper` (`-sh`) has been renamed to `--subdir-helper` (`-sh`). The Node.js

package.json

@@ -1,6 +1,6 @@
 {
   "name": "simple-scaffold",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Generate any file structure - from single components to entire app boilerplates, with a single command.",
   "homepage": "https: //chenasraf.github.io/simple-scaffold",
   "repository": "https://github.com/chenasraf/simple-scaffold.git",

release.config.js

@@ -31,6 +31,12 @@ module.exports = {
         pkgRoot: "dist",
       },
     ],
+    [
+      "@semantic-release/exec",
+      {
+        publish: "cd ./dist && pnpm pack --pack-destination=../",
+      },
+    ],
     [
       "@semantic-release/github",
       {

src/cmd.ts

@@ -1,4 +1,6 @@
 #!/usr/bin/env node
+
+import os from "node:os"
 import { massarg } from "massarg"
 import chalk from "chalk"
 import { LogLevel, ScaffoldCmdConfig } from "./types"
@@ -19,8 +21,13 @@ export async function parseCliArgs(args = process.argv.slice(2)) {
     description: pkg.description,
   })
     .main(async (config) => {
-      const parsed = await parseConfigFile(config)
-      return Scaffold(parsed)
+      const tmpPath = path.resolve(os.tmpdir(), `scaffold-config-${Date.now()}`)
+      const parsed = await parseConfigFile(config, tmpPath)
+      try {
+        return Scaffold(parsed)
+      } finally {
+        await fs.rm(tmpPath, { recursive: true, force: true })
+      }
     })
     .option({
       name: "name",
@@ -119,7 +126,7 @@ export async function parseCliArgs(args = process.argv.slice(2)) {
         "Determine amount of logs to display. The values are: " +
         `${chalk.bold`\`none | debug | info | warn | error\``}. ` +
         "The provided level will display messages of the same level or higher.",
-      parse: Number,
+      parse: (v) => v.toLowerCase(),
     })
     .flag({
       name: "dry-run",

src/config.ts

@@ -48,7 +48,7 @@ function isWrappedWithQuotes(string: string): boolean {
 }
 
 /** @internal */
-export async function parseConfigFile(config: ScaffoldCmdConfig): Promise<ScaffoldConfig> {
+export async function parseConfigFile(config: ScaffoldCmdConfig, tmpPath: string): Promise<ScaffoldConfig> {
   let output: ScaffoldConfig = config
 
   if (config.quiet) {
@@ -69,8 +69,9 @@ export async function parseConfigFile(config: ScaffoldCmdConfig): Promise<Scaffo
     const configPath = isGit ? config.git : configFilename
 
     log(config, LogLevel.info, `Loading config from ${configFilename} with key ${key}`)
-    const configPromise = await (config.git
-      ? getRemoteConfig({ git: configPath, config: configFilename, logLevel: config.logLevel })
+
+    const configPromise = await (isGit
+      ? getRemoteConfig({ git: configPath, config: configFilename, logLevel: config.logLevel, tmpPath })
       : getLocalConfig({ config: configFilename, logLevel: config.logLevel }))
 
     // resolve the config
@@ -123,7 +124,7 @@ export async function getLocalConfig(config: ConfigLoadConfig & Partial<LogConfi
 export async function getRemoteConfig(
   config: RemoteConfigLoadConfig & Partial<LogConfig>,
 ): Promise<ScaffoldConfigFile> {
-  const { config: configFile, git, ...logConfig } = config as Required<typeof config>
+  const { config: configFile, git, tmpPath, ...logConfig } = config as Required<typeof config>
 
   log(logConfig, LogLevel.info, `Loading config from remote ${git}, file ${configFile}`)
 
@@ -135,5 +136,5 @@ export async function getRemoteConfig(
     throw new Error(`Unsupported protocol ${url.protocol}`)
   }
 
-  return getGitConfig(url, configFile, logConfig)
+  return getGitConfig(url, configFile, tmpPath, logConfig)
 }

src/git.ts

@@ -1,5 +1,4 @@
 import path from "node:path"
-import os from "node:os"
 import fs from "node:fs/promises"
 import { log } from "./logger"
 import { AsyncResolver, LogConfig, LogLevel, ScaffoldCmdConfig, ScaffoldConfigMap } from "./types"
@@ -9,15 +8,15 @@ import { resolve, wrapNoopResolver } from "./utils"
 export async function getGitConfig(
   url: URL,
   file: string,
+  tmpPath: string,
   logConfig: LogConfig,
 ): Promise<AsyncResolver<ScaffoldCmdConfig, ScaffoldConfigMap>> {
   const repoUrl = `${url.protocol}//${url.host}${url.pathname}`
 
   log(logConfig, LogLevel.info, `Cloning git repo ${repoUrl}`)
 
-  const tmpPath = path.resolve(os.tmpdir(), `scaffold-config-${Date.now()}`)
-
   return new Promise((res, reject) => {
+    log(logConfig, LogLevel.debug, `Cloning git repo to ${tmpPath}`)
     const clone = spawn("git", ["clone", "--recurse-submodules", "--depth", "1", repoUrl, tmpPath])
 
     clone.on("error", reject)
@@ -47,6 +46,7 @@ export async function loadGitConfig({
   log(logConfig, LogLevel.info, `Loading config from git repo: ${repoUrl}`)
   const filename = file || (await findConfigFile(tmpPath))
   const absolutePath = path.resolve(tmpPath, filename)
+  log(logConfig, LogLevel.debug, `Resolving config file: ${absolutePath}`)
   const loadedConfig = await resolve(async () => (await import(absolutePath)).default as ScaffoldConfigMap, logConfig)
 
   log(logConfig, LogLevel.info, `Loaded config from git`)
@@ -58,7 +58,6 @@ export async function loadGitConfig({
       templates: v.templates.map((t) => path.resolve(tmpPath, t)),
     }
   }
-  await fs.rm(tmpPath, { recursive: true })
   return wrapNoopResolver(fixedConfig)
 }
 

src/scaffold.ts

@@ -5,6 +5,8 @@
  * See [readme](README.md)
  */
 import path from "node:path"
+import os from "node:os"
+
 import { handleErr, resolve } from "./utils"
 import {
   isDir,
@@ -128,8 +130,9 @@ Scaffold.fromConfig = async function (
     config: pathOrUrl,
     ...config,
   }
+  const tmpPath = path.resolve(os.tmpdir(), `scaffold-config-${Date.now()}`)
   const _overrides = resolve(overrides, _cmdConfig)
-  const _config = await parseConfigFile(_cmdConfig)
+  const _config = await parseConfigFile(_cmdConfig, tmpPath)
   return Scaffold({ ..._config, ..._overrides })
 }
 

src/types.ts

@@ -393,7 +393,7 @@ export type LogConfig = Pick<ScaffoldConfig, "logLevel">
 export type ConfigLoadConfig = LogConfig & Pick<ScaffoldCmdConfig, "config">
 
 /** @internal */
-export type RemoteConfigLoadConfig = LogConfig & Pick<ScaffoldCmdConfig, "config" | "git">
+export type RemoteConfigLoadConfig = LogConfig & Pick<ScaffoldCmdConfig, "config" | "git"> & { tmpPath: string }
 
 /** @internal */
 export type MinimalConfig = Pick<ScaffoldCmdConfig, "name" | "key">

tests/config.test.ts

@@ -68,25 +68,34 @@ describe("config", () => {
   describe("parseConfigFile", () => {
     test("normal config does not change", async () => {
       expect(
-        await parseConfigFile({
-          ...blankCliConf,
-        }),
+        await parseConfigFile(
+          {
+            ...blankCliConf,
+          },
+          `/tmp/scaffold-config-${Date.now()}`,
+        ),
       ).toEqual(blankCliConf)
     })
     describe("appendData", () => {
       test("appends", async () => {
-        const result = await parseConfigFile({
-          ...blankCliConf,
-          appendData: { key: "value" },
-        })
+        const result = await parseConfigFile(
+          {
+            ...blankCliConf,
+            appendData: { key: "value" },
+          },
+          `/tmp/scaffold-config-${Date.now()}`,
+        )
         expect(result?.data?.key).toEqual("value")
       })
       test("overwrites existing value", async () => {
-        const result = await parseConfigFile({
-          ...blankCliConf,
-          data: { num: "123" },
-          appendData: { num: "1234" },
-        })
+        const result = await parseConfigFile(
+          {
+            ...blankCliConf,
+            data: { num: "123" },
+            appendData: { num: "1234" },
+          },
+          `/tmp/scaffold-config-${Date.now()}`,
+        )
         expect(result?.data?.num).toEqual("1234")
       })
     })
@@ -97,6 +106,7 @@ describe("config", () => {
       const resultFn = await config.getRemoteConfig({
         git: "https://github.com/chenasraf/simple-scaffold.git",
         logLevel: LogLevel.none,
+        tmpPath: `/tmp/scaffold-config-${Date.now()}`,
       })
       const result = await resolve(resultFn, blankCliConf)
       expect(result).toEqual(blankCliConf)