remove types from package.json

v1.0

.github/workflows/alpha.yml

@@ -13,7 +13,6 @@ jobs:
         with:
           node-version: "12.x"
       - run: yarn install --frozen-lockfile
-      - run: yarn test
       - run: yarn build
       - run: cd ./dist && yarn pack --filename=../package.tgz
         if: "!contains(github.event.head_commit.message, '[skip publish]')"
@@ -36,7 +35,6 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          prerelease: true
           tag_name: ${{ steps.update_tag.outputs.tagname }}
           release_name: Release ${{ steps.update_tag.outputs.tagname }}
       - name: Upload Release Asset
@@ -48,5 +46,5 @@ jobs:
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
           asset_path: ./package.tgz
-          asset_name: simple-scaffold ${{ steps.update_tag.outputs.tagname }}.tgz
+          asset_name: package.tgz
           asset_content_type: application/tgz

.github/workflows/main.yml

@@ -13,7 +13,6 @@ jobs:
         with:
           node-version: "12.x"
       - run: yarn install --frozen-lockfile
-      - run: yarn test
       - run: yarn build
       - run: cd ./dist && yarn pack --filename=../package.tgz
         if: "!contains(github.event.head_commit.message, '[skip publish]')"
@@ -46,5 +45,5 @@ jobs:
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
           asset_path: ./package.tgz
-          asset_name: simple-scaffold ${{ steps.update_tag.outputs.tagname }}.tgz
+          asset_name: package.tgz
           asset_content_type: application/tgz

.vscode/settings.json

@@ -2,12 +2,6 @@
   "typescript.tsdk": "./node_modules/typescript/lib",
   "npm.packageManager": "yarn",
   "cSpell.words": [
-    "massarg",
-    "nobrace",
-    "nocomment",
-    "nodir",
-    "noext",
-    "nonegate",
-    "subdir"
+    "massarg"
   ]
 }

MIGRATION.md

@@ -1,21 +0,0 @@
-# Migrating from 0.x to 1.0
-
-In Simple Scaffold v1.0, the entire codebase was overhauled, yet usage remains mostly the same
-between versions. With these notable exceptions:
-
-- Some of the argument names have changed
-- Template syntax has been improved
-- The command to run Scaffold has been simplified from `new SimpleScaffold(opts).run()` to `SimpleScaffold(opts)`, which now returns a promise that you can await to know when the process has been completed.
-
-## Argument changes
-
-- `locals` has been renamed to `data`. The appropriate command line args have been updated as
-  well to `--data` | `-d`.
-
-## Template syntax changes
-
-Simple Scaffold still uses Handlebars.js to handle template content and file names. However, helpers
-have been added to remove the need for you to pre-process the template data on simple use-cases such
-as case type manipulation (converting to camel case, snake case, etc)
-
-See the readme for the full information on how to use these helpers and which are available.

README.md

@@ -2,16 +2,6 @@
 
 Simple Scaffold allows you to create your structured files based on templates.
 
-Simply organize your commonly-created files in their original structure, and replace any variable
-values (such as component or app name) inside the paths or contents of the files with tokens to be
-populated upon scaffolding.
-
-Then, run Simple Scaffold and it will generate your files for you in the desired structure,
-with file names and contents that contain your dynamic information.
-
-It's a simple way to easily create reusable components, common class files to start writing from,
-or even entire app structures.
-
 ## Install
 
 You can either use it as a command line tool or import into your own code and run from there.
@@ -36,45 +26,41 @@ Create structured files based on templates.
 
 Options:
 
-  --help|-h                       Display help information
+  --help|-h                 Display help information
 
-  --name|-n                       Name to be passed to the generated files. {{name}} and
-                                  {{Name}} inside contents and file names will be replaced
-                                  accordingly.
+  --name|-n                 Name to be passed to the generated files. {{name}} and
+                            {{Name}} inside contents and file names will be replaced
+                            accordingly.
 
-  --output|-o                     Path to output to. If --create-sub-folder is enabled,
-                                  the subfolder will be created inside this path.
-                                  (default: current dir)
+  --output|-o               Path to output to. If --create-sub-folder is enabled, the
+                            subfolder will be created inside this path.
 
-  --templates|-t                  Template files to use as input. You may provide multiple
-                                  files, each of which can be a relative or absolute path, or a
-                                  glob pattern for multiple file matching easily.
+  --templates|-t            Template files to use as input. You may provide multiple
+                            files, each of which can be a relative or absolute path, or a glob
+                            pattern for multiple file matching easily. (default:
+                            )
 
-  --overwrite|-w                  Enable to override output files, even if they already
-                                  exist. (default: false)
+  --overwrite|-w            Enable to override output files, even if they already exist.
+                            (default: false)
 
-  --data|-d                       Add custom data to the templates. By default, only your
-                                  app name is included.
+  --data|-d                 Add custom data to the templates. By default, only your app
+                            name is included.
 
-  --create-sub-folder|-s          Create subfolder with the input name
-                                  (default: false)
+  --create-sub-folder|-s    Create subfolder with the input name (default:
+                            false)
 
-  --sub-folder-name-helper|-sh    Default helper to apply to subfolder name when using
-                                  `--create-sub-folder true`.
+  --quiet|-q                Suppress output logs (Same as --verbose 0)
+                            (default: false)
 
-  --quiet|-q                      Suppress output logs (Same as --verbose 0)
-                                  (default: false)
+  --verbose|-v              Determine amount of logs to display. The values are: 0
+                            (none) | 1 (debug) | 2 (info) | 3 (warn) | 4 (error). The
+                            provided level will display messages of the same level or higher.
+                            (default: 2)
 
-  --verbose|-v                    Determine amount of logs to display. The values are:
-                                  0 (none) | 1 (debug) | 2 (info) | 3 (warn) | 4
-                                  (error). The provided level will display messages of
-                                  the same level or higher. (default:
-                                  2)
-
-  --dry-run|-dr                   Don't emit files. This is good for testing your
-                                  scaffolds and making sure they don't fail, without having to
-                                  write actual file contents or create directories.
-                                  (default: false)
+  --dry-run|-dr             Don't emit files. This is good for testing your scaffolds and
+                            making sure they don't fail, without having to write actual file
+                            contents or create directories. (default:
+                            false)
 ```
 
 You can also add this as a script in your `package.json`:
@@ -92,47 +78,32 @@ You can also add this as a script in your `package.json`:
 ## Use in Node.js
 
 You can also build the scaffold yourself, if you want to create more complex arguments or scaffold groups.
-Simply pass a config object to the Scaffold function when you are ready to start.
+Simply pass a config object to the constructor, and invoke `run()` when you are ready to start.
 The config takes similar arguments to the command line:
 
-```typescript
-import Scaffold from "simple-scaffold"
+```javascript
+const SimpleScaffold = require("simple-scaffold").default
 
-const config = {
+const scaffold = SimpleScaffold({
   name: "component",
   templates: [path.join(__dirname, "scaffolds", "component")],
   output: path.join(__dirname, "src", "components"),
   createSubFolder: true,
-  subFolderNameHelper: "upperCase"
   locals: {
     property: "value",
   },
-  helpers: {
-    twice: (text) => [text, text].join(" ")
-  }
-}
-
-const scaffold = Scaffold(config)
+})
 ```
 
-### Additional Node.js options
+The exception in the config is that `output`, when used in Node directly, may also be passed a
+function for each input file to output into a dynamic path:
 
-In addition to all the options available in the command line, there are some JS-specific options
-available:
-
-1. When `output` is used in Node directly, it may also be passed a function for each input file to
-   output into a dynamic path:
-
-    ```typescript
-    config.output = (fullPath, baseDir, baseName) => {
-      console.log({ fullPath, baseDir, baseName })
-      return path.resolve(baseDir, baseName)
-    }
-    ```
-
-2. You may add custom `helpers` to your scaffolds. Helpers are simple `(string) => string` functions
-   that transform your `data` variables into other values. See [Helpers](#helpers) for the list of
-   default helpers, or add your own to be loaded into the template parser.
+```javascript
+config.output = (fullPath, baseDir, baseName) => {
+  console.log({ fullPath, baseDir, baseName })
+  return path.resolve(baseDir, baseName)
+}
+```
 
 ## Preparing files
 
@@ -175,23 +146,8 @@ Here are the built-in helpers available for use:
 | kebabCase   | `{{ kebabCase name }}`  | my-name        |
 | hyphenCase  | `{{ hyphenCase name }}` | my-name        |
 | pascalCase  | `{{ pascalCase name }}` | MyName         |
-| upperCase   | `{{ upperCase name }}`  | MYNAME         |
-| lowerCase   | `{{ lowerCase name }}`  | myname         |
 
-> These helpers are available for any data property, not exclusive to `name`.
-
-You may also add your own custom helpers using the `helpers` options when using the JS API (rather
-than the CLI). The `helpers` option takes an object whose keys are helper names, and values are
-the transformation functions. For example, `upperCase` is implemented like so:
-
-```typescript
-config.helpers = {
-  upperCase: (text) => text.toUpperCase(),
-}
-```
-
-These helpers will also be available to you when using `subFolderNameHelper` or
-`--sub-folder-name-helper` as a possible value.
+**Note:** These helpers are available for any data property, not exclusive to `name`.
 
 ## Examples
 
@@ -218,15 +174,15 @@ simple-scaffold MyComponent \
     - ...
 ```
 
-#### Contents of `project/scaffold/{{Name}}.jsx`
+#### Contents of `project/scaffold/{{Name}}.js`
 
 ```js
 const React = require('react')
 
-module.exports = function {{Name}}(props) {
-  return (
+module.exports = class {{Name}} extends React.Component {
+  render() {
     <div className="{{className}}">{{Name}} Component</div>
-  )
+  }
 }
 ```
 
@@ -253,42 +209,14 @@ With `createSubFolder = false`:
     - ...
 ```
 
-#### Contents of `project/scaffold/MyComponent/MyComponent.jsx`
+#### Contents of `project/scaffold/MyComponent/MyComponent.js`
 
 ```js
 const React = require("react")
 
-module.exports = function MyComponent(props) {
-  return (
+module.exports = class MyComponent extends React.Component {
+  render() {
     <div className="myClassName">MyComponent Component</div>
-  )
+  }
 }
 ```
-
-## Contributing
-
-I welcome any issues or pull requests on GitHub. If you find a bug, or would like a new feature,
-don't hesitate to open an appropriate issue and I will do my best to reply promptly.
-
-If you are a developer and want to contribute code, here are some starting tips:
-
-1. Fork this repository
-2. Run `yarn install`
-3. Run `yarn dev` to start file watch mode
-4. Make any changes you would like
-5. Create tests for your changes
-6. Update the relevant documentation (readme, code comments, type comments)
-7. Create a PR on upstream
-
-Some tips on getting around the code:
-
-- Use `yarn dev` for development - it runs TypeScript compile in watch mode, allowing you to make
-  changes and immediately be able to try them using `yarn cmd`.
-- Use `yarn build` to build the output
-- Use `yarn test` to run tests
-- Use `yarn cmd` to use the CLI feature of Simple Scaffold from within the root directory,
-  enabling you to test different behaviors. See `yarn cmd -h` for more information.
-
-  > This requires an updated build, and does not trigger one itself. Either use `yarn dev` to watch
-  > for changes and build, or `yarn build` before running this, or use `yarn build-cmd` instead, 
-  > which triggers a build right before running the command with the rest of the given arguments.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "simple-scaffold",
-  "version": "1.0.2",
+  "version": "1.0.0-alpha.9",
   "description": "Create files based on templates",
   "repository": "https://github.com/chenasraf/simple-scaffold.git",
   "author": "Chen Asraf <inbox@casraf.com>",
@@ -9,7 +9,7 @@
   "bin": "cmd.js",
   "scripts": {
     "clean": "rm -rf dist/",
-    "build": "yarn clean && tsc && chmod -R +x ./dist && cp ./package.json ./README.md ./dist/",
+    "build": "yarn clean && tsc && chmod -R +x ./dist && cp ./package.json ./dist/ && cp ./README.md ./dist/",
     "dev": "tsc --watch",
     "start": "node dist/scaffold.js",
     "test": "jest --verbose",
@@ -23,7 +23,7 @@
     "glob": "^7.1.3",
     "handlebars": "^4.7.7",
     "lodash": "^4.17.21",
-    "massarg": "^1.0.5",
+    "massarg": "^1.0.3",
     "util.promisify": "^1.1.1"
   },
   "devDependencies": {

src/cmd.ts

@@ -1,102 +1,2 @@
-#!/usr/bin/env node
-import massarg from "massarg"
-import chalk from "chalk"
-import { LogLevel, ScaffoldCmdConfig } from "./types"
-import { Scaffold } from "./scaffold"
-
-export function parseCliArgs(args = process.argv.slice(2)) {
-  return (
-    massarg<ScaffoldCmdConfig & { help: boolean; extras: string[] }>()
-      .main(Scaffold)
-      .option({
-        name: "name",
-        aliases: ["n"],
-        description:
-          "Name to be passed to the generated files. {{name}} and {{Name}} inside contents and file names will be replaced accordingly.",
-        isDefault: true,
-        required: true,
-      })
-      .option({
-        name: "output",
-        aliases: ["o"],
-        description: `Path to output to. If --create-sub-folder is enabled, the subfolder will be created inside this path. ${chalk.reset`${chalk.white`(default: current dir)`}`}`,
-        required: true,
-      })
-      .option({
-        name: "templates",
-        aliases: ["t"],
-        array: true,
-        description:
-          "Template files to use as input. You may provide multiple files, each of which can be a relative or absolute path, " +
-          "or a glob pattern for multiple file matching easily.",
-        required: true,
-      })
-      .option({
-        name: "overwrite",
-        aliases: ["w"],
-        boolean: true,
-        defaultValue: false,
-        description: "Enable to override output files, even if they already exist.",
-      })
-      .option({
-        name: "data",
-        aliases: ["d"],
-        description: "Add custom data to the templates. By default, only your app name is included.",
-        parse: (v) => JSON.parse(v),
-      })
-      .option({
-        name: "create-sub-folder",
-        aliases: ["s"],
-        boolean: true,
-        defaultValue: false,
-        description: "Create subfolder with the input name",
-      })
-      .option({
-        name: "sub-folder-name-helper",
-        aliases: ["sh"],
-        description: "Default helper to apply to subfolder name when using `--create-sub-folder true`.",
-      })
-      .option({
-        name: "quiet",
-        aliases: ["q"],
-        boolean: true,
-        defaultValue: false,
-        description: "Suppress output logs (Same as --verbose 0)",
-      })
-      .option({
-        name: "verbose",
-        aliases: ["v"],
-        defaultValue: LogLevel.Info,
-        description: `Determine amount of logs to display. The values are: ${chalk.bold`0 (none) | 1 (debug) | 2 (info) | 3 (warn) | 4 (error)`}. The provided level will display messages of the same level or higher.`,
-        parse: Number,
-      })
-      .option({
-        name: "dry-run",
-        aliases: ["dr"],
-        boolean: true,
-        defaultValue: false,
-        description:
-          "Don't emit files. This is good for testing your scaffolds and making sure they " +
-          "don't fail, without having to write actual file contents or create directories.",
-      })
-      // .example({
-      //   input: `yarn cmd -t examples/test-input/Component -o examples/test-output -d '{"property":"myProp","value":"10"}'`,
-      //   description: "Usage",
-      //   output: "",
-      // })
-      .help({
-        binName: "simple-scaffold",
-        useGlobalColumns: true,
-        usageExample: "[options]",
-        header: "Create structured files based on templates.",
-        footer: [
-          `Copyright © Chen Asraf 2021`,
-          `NPM: ${chalk.underline`https://npmjs.com/package/simple-scaffold`}`,
-          `GitHub: ${chalk.underline`https://github.com/chenasraf/simple-scaffold`}`,
-        ].join("\n"),
-      })
-      .parse(args)
-  )
-}
-
+import { parseCliArgs } from "./cmd_util"
 parseCliArgs()

src/cmd_util.ts

@@ -0,0 +1,89 @@
+import massarg from "massarg"
+import chalk from "chalk"
+import { LogLevel, ScaffoldCmdConfig } from "./types"
+import { Scaffold } from "./scaffold"
+
+export function parseCliArgs(args = process.argv.slice(2)) {
+  return (
+    massarg<ScaffoldCmdConfig & { help: boolean; extras: string[] }>()
+      .main(Scaffold)
+      .option({
+        name: "name",
+        aliases: ["n"],
+        isDefault: true,
+        description:
+          "Name to be passed to the generated files. {{name}} and {{Name}} inside contents and file names will be replaced accordingly.",
+      })
+      .option({
+        name: "output",
+        aliases: ["o"],
+        description:
+          "Path to output to. If --create-sub-folder is enabled, the subfolder will be created inside this path.",
+      })
+      .option({
+        name: "templates",
+        aliases: ["t"],
+        description:
+          "Template files to use as input. You may provide multiple files, each of which can be a relative or absolute path, " +
+          "or a glob pattern for multiple file matching easily.",
+        defaultValue: [],
+        array: true,
+      })
+      .option({
+        aliases: ["w"],
+        name: "overwrite",
+        description: "Enable to override output files, even if they already exist.",
+        defaultValue: false,
+        boolean: true,
+      })
+      .option({
+        aliases: ["d"],
+        name: "data",
+        description: "Add custom data to the templates. By default, only your app name is included.",
+        parse: (v) => JSON.parse(v),
+      })
+      .option({
+        aliases: ["s"],
+        name: "create-sub-folder",
+        description: "Create subfolder with the input name",
+        defaultValue: false,
+        boolean: true,
+      })
+      .option({
+        aliases: ["q"],
+        name: "quiet",
+        description: "Suppress output logs (Same as --verbose 0)",
+        defaultValue: false,
+        boolean: true,
+      })
+      .option({
+        aliases: ["v"],
+        name: "verbose",
+        description: `Determine amount of logs to display. The values are: ${chalk.bold`0 (none) | 1 (debug) | 2 (info) | 3 (warn) | 4 (error)`}. The provided level will display messages of the same level or higher.`,
+        defaultValue: LogLevel.Info,
+        parse: Number,
+      })
+      .option({
+        aliases: ["dr"],
+        name: "dry-run",
+        description:
+          "Don't emit files. This is good for testing your scaffolds and making sure they " +
+          "don't fail, without having to write actual file contents or create directories.",
+        defaultValue: false,
+        boolean: true,
+      })
+      // .example({
+      //   input: `yarn cmd -t examples/test-input/Component -o examples/test-output -d '{"property":"myProp","value":"10"}'`,
+      //   description: "Usage",
+      //   output: "",
+      // })
+      .help({
+        binName: "simple-scaffold",
+        useGlobalColumns: true,
+        usageExample: "[options]",
+        header: "Create structured files based on templates.",
+        footer: `Copyright © Chen Asraf 2021\nNPM: ${chalk.underline`https://npmjs.com/package/massarg`}\nGitHub: ${chalk.underline`https://github.com/chenasraf/massarg`}`,
+      })
+      .parse(args)
+  )
+}

src/scaffold.ts

@@ -1,127 +1,131 @@
+import { glob } from "glob"
 import path from "path"
+import { promisify } from "util"
+import { promises as fsPromises } from "fs"
+const { readFile, writeFile } = fsPromises
 
 import {
   createDirIfNotExists,
   getOptionValueForFile,
   handleErr,
+  handlebarsParse,
   log,
+  pathExists,
   pascalCase,
   isDir,
   removeGlob,
-  makeRelativePath,
-  registerHelpers,
-  getTemplateGlobInfo,
-  ensureFileExists,
-  getFileList,
-  getBasePath,
-  copyFileTransformed,
-  getTemplateFileInfo,
-  logInitStep,
-  logInputFile,
 } from "./utils"
 import { LogLevel, ScaffoldConfig } from "./types"
 
-/**
- * Create a scaffold using given `options`.
- *
- * #### Create files
- * To create a file structure to output, use any directory and file structure you would like.
- * Inside folder names, file names or file contents, you may place `{{ var }}` where `var` is either
- * `name` which is the scaffold name you provided or one of the keys you provided in the `data` option.
- *
- * The contents and names will be replaced with the transformed values so you can use your original structure as a
- * boilerplate for other projects, components, modules, or even single files.
- *
- * #### Helpers
- * Helpers are functions you can use to transform your `{{ var }}` contents into other values without having to
- * pre-define the data and use a duplicated key. Common cases are transforming name-case format
- * (e.g. `MyName` → `my_name`), so these have been provided as defaults:
- *
- * | Helper name | Example code            | Example output |
- * | ----------- | ----------------------- | -------------- |
- * | camelCase   | `{{ camelCase name }}`  | myName         |
- * | snakeCase   | `{{ snakeCase name }}`  | my_name        |
- * | startCase   | `{{ startCase name }}`  | My Name        |
- * | kebabCase   | `{{ kebabCase name }}`  | my-name        |
- * | hyphenCase  | `{{ hyphenCase name }}` | my-name        |
- * | pascalCase  | `{{ pascalCase name }}` | MyName         |
- * | upperCase   | `{{ upperCase name }}`  | MYNAME         |
- * | lowerCase   | `{{ lowerCase name }}`  | myname         |
- *
- * Any functions you provide in `helpers` option will also be available to you to make custom formatting as you see fit
- * (for example, formatting a date)
- */
-export async function Scaffold({ ...options }: ScaffoldConfig) {
-  options.output ??= process.cwd()
-
-  registerHelpers(options)
+export async function Scaffold(config: ScaffoldConfig) {
   try {
-    options.data = { name: options.name, Name: pascalCase(options.name), ...options.data }
-    logInitStep(options)
-    for (let _template of options.templates) {
+    const options = { ...config }
+    const data = { name: options.name, Name: pascalCase(options.name), ...options.data }
+    log(options, LogLevel.Debug, "Full config:", {
+      name: options.name,
+      templates: options.templates,
+      output: options.output,
+      createSubfolder: options.createSubFolder,
+      data: options.data,
+      overwrite: options.overwrite,
+      quiet: options.quiet,
+    })
+    log(options, LogLevel.Info, "Data:", data)
+    for (let template of config.templates) {
       try {
-        const { nonGlobTemplate, origTemplate, isDirOrGlob, isGlob, template } = await getTemplateGlobInfo(
-          options,
-          _template
-        )
-        await ensureFileExists(template, isDirOrGlob)
-        const files = await getFileList(options, template)
-        for (const inputFilePath of files) {
-          if (await isDir(inputFilePath)) {
-            continue
+        const _isGlob = template.includes("*")
+        const _nonGlobTemplate = _isGlob ? removeGlob(template) : template
+        const _isDir = _isGlob ? false : await isDir(template)
+        const _shouldAddGlob = !_isGlob && !_isDir
+        if (_shouldAddGlob) {
+          template = template + "/**/*"
+        }
+        const files = await promisify(glob)(template, { dot: true, debug: false })
+        for (const templatePath of files) {
+          if (!(await isDir(templatePath))) {
+            const basePath = path
+              .resolve(
+                process.cwd(),
+                _isDir
+                  ? templatePath.replace(template, "")
+                  : path.dirname(removeGlob(templatePath).replace(_nonGlobTemplate, ""))
+              )
+              .replace(process.cwd() + "/", "")
+              .replace(process.cwd(), "")
+            log(
+              options,
+              LogLevel.Debug,
+              `\ntemplate: ${template}\ntemplatePath: ${templatePath}, \nbase path: ${basePath}\n`
+            )
+            await handleTemplateFile(templatePath, basePath, options, data)
           }
-          const relPath = makeRelativePath(path.dirname(removeGlob(inputFilePath).replace(nonGlobTemplate, "")))
-          const basePath = getBasePath(relPath)
-          logInputFile(options, {
-            origTemplate,
-            relPath,
-            template,
-            inputFilePath,
-            nonGlobTemplate,
-            basePath,
-            isDirOrGlob,
-            isGlob,
-          })
-          await handleTemplateFile(options, options.data, { templatePath: inputFilePath, basePath })
         }
       } catch (e: any) {
         handleErr(e)
       }
     }
   } catch (e: any) {
-    log(options, LogLevel.Error, e)
+    console.error(e)
     throw e
   }
 }
+
 async function handleTemplateFile(
+  templatePath: string,
+  basePath: string,
   options: ScaffoldConfig,
-  data: Record<string, string>,
-  { templatePath, basePath }: { templatePath: string; basePath: string }
+  data: Record<string, string>
 ): Promise<void> {
   return new Promise(async (resolve, reject) => {
     try {
-      const { inputPath, outputPathOpt, outputDir, outputPath, exists } = await getTemplateFileInfo(options, data, {
-        templatePath,
-        basePath,
-      })
-      const overwrite = getOptionValueForFile(options, inputPath, data, options.overwrite ?? false)
-
+      const inputPath = path.resolve(process.cwd(), templatePath)
+      const outputPathOpt = getOptionValueForFile(inputPath, data, options.output)
+      const outputDir = path.resolve(
+        process.cwd(),
+        ...([outputPathOpt, basePath, options.createSubFolder ? options.name : undefined].filter(Boolean) as string[])
+      )
       log(
         options,
         LogLevel.Debug,
         `\nParsing ${templatePath}`,
         `\nBase path: ${basePath}`,
         `\nFull input path: ${inputPath}`,
-        `\nOutput Path Opt: ${outputPathOpt}`,
-        `\nFull output dir: ${outputDir}`,
-        `\nFull output path: ${outputPath}`,
-        `\n`
+        `\nFull output path: ${outputDir}\n`
+      )
+      const outputPath = path.join(outputDir, handlebarsParse(path.basename(inputPath), data))
+      const overwrite = getOptionValueForFile(inputPath, data, options.overwrite ?? false)
+      const exists = await pathExists(outputPath)
+
+      log(
+        options,
+        LogLevel.Debug,
+        "Filename parsed:",
+        handlebarsParse(path.basename(inputPath), data),
+        "Orig:",
+        path.basename(inputPath)
+        // "Test:",
+        // handlebarsParse("{{name}} {{name pascalCase}}", data)
       )
 
-      await createDirIfNotExists(path.dirname(outputPath), options)
+      await createDirIfNotExists(outputDir, options)
 
       log(options, LogLevel.Info, `Writing to ${outputPath}`)
-      await copyFileTransformed(options, data, { exists, overwrite, outputPath, inputPath })
+      if (!exists || overwrite) {
+        if (exists && overwrite) {
+          log(options, LogLevel.Info, `File ${outputPath} exists, overwriting`)
+        }
+        const templateBuffer = await readFile(inputPath)
+        const outputContents = handlebarsParse(templateBuffer, data)
+
+        if (!options.dryRun) {
+          await writeFile(outputPath, outputContents)
+        } else {
+          log(options, LogLevel.Info, "Content output:")
+          log(options, LogLevel.Info, outputContents)
+        }
+      } else if (exists) {
+        log(options, LogLevel.Info, `File ${outputPath} already exists, skipping`)
+      }
       resolve()
     } catch (e: any) {
       handleErr(e)

src/types.ts

@@ -10,109 +10,19 @@ export type FileResponseFn<T> = (fullPath: string, basedir: string, basename: st
 
 export type FileResponse<T> = T | FileResponseFn<T>
 
-export type DefaultHelperKeys =
-  | "camelCase"
-  | "snakeCase"
-  | "startCase"
-  | "kebabCase"
-  | "hyphenCase"
-  | "pascalCase"
-  | "lowerCase"
-  | "upperCase"
-
-export type HelperKeys<T> = DefaultHelperKeys | T
-
-export type Helper = (text: string) => string
-
 export interface ScaffoldConfig {
-  /**
-   * Name to be passed to the generated files. `{{name}}` and `{{Name}}` inside contents and file names will be replaced
-   * accordingly.
-   */
+  /** The name supplied for the output templates */
   name: string
-
-  /**
-   * Template files to use as input. You may provide multiple files, each of which can be a relative or absolute path,
-   * or a glob pattern for multiple file matching easily. (default: current working directory)
-   */
+  /** Template input files/dirs/glob patterns to use as template input. These will be copied to the output directory. */
   templates: string[]
-
-  /** Path to output to. If `createSubFolder` is `true`, the subfolder will be created inside this path. */
+  /** Output directory to put scaffolded files in. */
   output: FileResponse<string>
-
-  /**
-   * Create subfolder with the input name (default: `false`)
-   */
   createSubFolder?: boolean
-
-  /**
-   * Add custom data to the templates. By default, only your app name is included as `{{name}}` and `{{Name}}`.
-   */
   data?: Record<string, string>
-
-  /**
-   * Enable to override output files, even if they already exist. (default: `false`)
-   *
-   * You may supply a function to this option, which can take the arguments `(fullPath, baseDir, baseName)` and returns
-   * a string, to return a dynamic path for each file.
-   */
   overwrite?: FileResponse<boolean>
-
-  /** Suppress output logs (Same as `verbose: 0` or `verbose: LogLevel.None`) */
   quiet?: boolean
-
-  /**
-   * Determine amount of logs to display.
-   *
-   * The values are: `0 (none) | 1 (debug) | 2 (info) | 3 (warn) | 4 (error)`. The provided level will display messages
-   * of the same level or higher. (default: `2 (info)`)
-   * @see LogLevel
-   */
   verbose?: LogLevel
-
-  /**
-   * Don't emit files. This is good for testing your scaffolds and making sure they don't fail, without having to write
-   * actual file contents or create directories. (default: `false`)
-   */
   dryRun?: boolean
-
-  /**
-   * Additional helpers to add to the template parser. Provide an object whose keys are the name of the function to add,
-   * and the value is the helper function itself. The signature of helpers is as follows:
-   * ```typescript
-   * (text: string) => string
-   * ```
-   *
-   * A full example might be:
-   *
-   * ```typescript
-   * Scaffold({
-   *   //...
-   *   helpers: {
-   *     upperCamelCase: (text) => camelCase(text).toUpperCase()
-   *   }
-   * })
-   * ```
-   *
-   * Here are the built-in helpers available for use:
-   * | Helper name | Example code            | Example output |
-   * | ----------- | ----------------------- | -------------- |
-   * | camelCase   | `{{ camelCase name }}`  | myName         |
-   * | snakeCase   | `{{ snakeCase name }}`  | my_name        |
-   * | startCase   | `{{ startCase name }}`  | My Name        |
-   * | kebabCase   | `{{ kebabCase name }}`  | my-name        |
-   * | hyphenCase  | `{{ hyphenCase name }}` | my-name        |
-   * | pascalCase  | `{{ pascalCase name }}` | MyName         |
-   * | upperCase   | `{{ upperCase name }}`  | MYNAME         |
-   * | lowerCase   | `{{ lowerCase name }}`  | myname         |
-   */
-  helpers?: Record<string, Helper>
-
-  /**
-   * Default transformer to apply to subfolder name when using `createSubFolder: true`. Can be one of the default
-   * helpers, or a custom one you provide to `helpers`. Defaults to `undefined`, which means no transformation is done.
-   */
-  subFolderNameHelper?: DefaultHelperKeys | string
 }
 export interface ScaffoldCmdConfig {
   name: string
@@ -122,6 +32,5 @@ export interface ScaffoldCmdConfig {
   data?: Record<string, string>
   overwrite: boolean
   quiet: boolean
-  verbose: LogLevel
   dryRun: boolean
 }

src/utils.ts

@@ -1,6 +1,6 @@
 import path from "path"
 import { F_OK } from "constants"
-import { DefaultHelperKeys, FileResponse, FileResponseFn, Helper, LogLevel, ScaffoldConfig } from "./types"
+import { FileResponse, FileResponseFn, LogLevel, ScaffoldConfig } from "./types"
 import camelCase from "lodash/camelCase"
 import snakeCase from "lodash/snakeCase"
 import kebabCase from "lodash/kebabCase"
@@ -10,27 +10,17 @@ import { promises as fsPromises } from "fs"
 import chalk from "chalk"
 const { stat, access, mkdir } = fsPromises
 
-import { glob } from "glob"
-import { promisify } from "util"
-const { readFile, writeFile } = fsPromises
-
-export const defaultHelpers: Record<DefaultHelperKeys, Helper> = {
+const helpers = {
   camelCase,
   snakeCase,
   startCase,
   kebabCase,
   hyphenCase: kebabCase,
   pascalCase,
-  lowerCase: (text) => text.toLowerCase(),
-  upperCase: (text) => text.toUpperCase(),
 }
 
-export function registerHelpers(options: ScaffoldConfig) {
-  const _helpers = { ...defaultHelpers, ...options.helpers }
-  for (const helperName in _helpers) {
-    log(options, LogLevel.Debug, `Registering helper: ${helperName}`)
-    Handlebars.registerHelper(helperName, _helpers[helperName as keyof typeof _helpers])
-  }
+for (const helperName in helpers) {
+  Handlebars.registerHelper(helperName, helpers[helperName as keyof typeof helpers])
 }
 
 export function handleErr(err: NodeJS.ErrnoException | null) {
@@ -38,7 +28,7 @@ export function handleErr(err: NodeJS.ErrnoException | null) {
 }
 
 export function log(options: ScaffoldConfig, level: LogLevel, ...obj: any[]) {
-  if (options.quiet || options.verbose === LogLevel.None || level < (options.verbose ?? LogLevel.Info)) {
+  if (options.quiet || options.verbose === LogLevel.None || (options.verbose ?? LogLevel.Info) > level) {
     return
   }
   const levelColor: Record<LogLevel, keyof typeof chalk> = {
@@ -49,17 +39,8 @@ export function log(options: ScaffoldConfig, level: LogLevel, ...obj: any[]) {
     [LogLevel.Error]: "red",
   }
   const chalkFn: any = chalk[levelColor[level]]
-  const key: "log" | "warn" | "error" = level === LogLevel.Error ? "error" : level === LogLevel.Warning ? "warn" : "log"
-  const logFn: any = console[key]
-  logFn(
-    ...obj.map((i) =>
-      i instanceof Error
-        ? chalkFn(i, JSON.stringify(i, undefined, 1), i.stack)
-        : typeof i === "object"
-        ? chalkFn(JSON.stringify(i, undefined, 1))
-        : chalkFn(i)
-    )
-  )
+  console["log"](...obj.map((i) => (typeof i === "object" ? chalkFn(JSON.stringify(i, undefined, 1)) : chalkFn(i))))
+  // console["log"](...obj)
 }
 
 export async function createDirIfNotExists(dir: string, options: ScaffoldConfig): Promise<void> {
@@ -71,7 +52,6 @@ export async function createDirIfNotExists(dir: string, options: ScaffoldConfig)
 
   if (!(await pathExists(dir))) {
     try {
-      log(options, LogLevel.Debug, `Creating dir ${dir}`)
       await mkdir(dir)
       return
     } catch (e: any) {
@@ -84,7 +64,6 @@ export async function createDirIfNotExists(dir: string, options: ScaffoldConfig)
 }
 
 export function getOptionValueForFile<T>(
-  options: ScaffoldConfig,
   filePath: string,
   data: Record<string, string>,
   fn: FileResponse<T>,
@@ -95,32 +74,15 @@ export function getOptionValueForFile<T>(
   }
   return (fn as FileResponseFn<T>)(
     filePath,
-    path.dirname(handlebarsParse(options, filePath, { isPath: true }).toString()),
-    path.basename(handlebarsParse(options, filePath, { isPath: true }).toString())
+    path.dirname(handlebarsParse(filePath, data)),
+    path.basename(handlebarsParse(filePath, data))
   )
 }
 
-export function handlebarsParse(
-  options: ScaffoldConfig,
-  templateBuffer: Buffer | string,
-  { isPath = false }: { isPath?: boolean } = {}
-) {
-  const { data } = options
-  try {
-    let str = templateBuffer.toString()
-    if (isPath) {
-      str = str.replace(/\\/g, "/")
-    }
-    const parser = Handlebars.compile(str, { noEscape: true })
-    let outputContents = parser(data)
-    if (isPath && path.sep !== "/") {
-      outputContents = outputContents.replace(/\//g, "\\")
-    }
-    return outputContents
-  } catch {
-    log(options, LogLevel.Warning, "Couldn't parse file with handlebars, returning original content")
-    return templateBuffer
-  }
+export function handlebarsParse(templateBuffer: Buffer | string, data: Record<string, string>) {
+  const parser = Handlebars.compile(templateBuffer.toString(), { noEscape: true })
+  const outputContents = parser(data)
+  return outputContents
 }
 
 export async function pathExists(filePath: string): Promise<boolean> {
@@ -145,187 +107,5 @@ export async function isDir(path: string): Promise<boolean> {
 }
 
 export function removeGlob(template: string) {
-  return template.replace(/\*/g, "").replace(/(\/\/|\\\\)/g, path.sep)
-}
-
-export function makeRelativePath(str: string): string {
-  return str.startsWith(path.sep) ? str.slice(1) : str
-}
-
-export function getBasePath(relPath: string) {
-  return path
-    .resolve(process.cwd(), relPath)
-    .replace(process.cwd() + path.sep, "")
-    .replace(process.cwd(), "")
-}
-
-export async function getFileList(options: ScaffoldConfig, template: string) {
-  return (
-    await promisify(glob)(template, {
-      dot: true,
-      debug: options.verbose === LogLevel.Debug,
-      nodir: true,
-    })
-  ).map((f) => f.replace(/\//g, path.sep))
-}
-
-export interface GlobInfo {
-  nonGlobTemplate: string
-  origTemplate: string
-  isDirOrGlob: boolean
-  isGlob: boolean
-  template: string
-}
-
-export async function getTemplateGlobInfo(options: ScaffoldConfig, template: string): Promise<GlobInfo> {
-  const isGlob = glob.hasMagic(template)
-  log(options, LogLevel.Debug, "before isDir", "isGlob:", isGlob, template)
-  let _template = template
-  const nonGlobTemplate = isGlob ? removeGlob(template) : template
-  const isDirOrGlob = isGlob ? true : await isDir(template)
-  log(options, LogLevel.Debug, "after isDir", isDirOrGlob)
-  const _shouldAddGlob = !isGlob && isDirOrGlob
-  const origTemplate = template
-  if (_shouldAddGlob) {
-    _template = path.join(template, "**", "*")
-  }
-  return { nonGlobTemplate, origTemplate, isDirOrGlob, isGlob, template: _template }
-}
-
-export async function ensureFileExists(template: string, isGlob: boolean) {
-  if (!isGlob && !(await pathExists(template))) {
-    const err: NodeJS.ErrnoException = new Error(`ENOENT, no such file or directory ${template}`)
-    err.code = "ENOENT"
-    err.path = template
-    err.errno = -2
-    throw err
-  }
-}
-
-export interface OutputFileInfo {
-  inputPath: string
-  outputPathOpt: string
-  outputDir: string
-  outputPath: string
-  exists: boolean
-}
-
-export async function getTemplateFileInfo(
-  options: ScaffoldConfig,
-  data: Record<string, string>,
-  { templatePath, basePath }: { templatePath: string; basePath: string }
-): Promise<OutputFileInfo> {
-  const inputPath = path.resolve(process.cwd(), templatePath)
-  const outputPathOpt = getOptionValueForFile(options, inputPath, data, options.output)
-  const outputDir = getOutputDir(options, data, outputPathOpt, basePath)
-  const outputPath = handlebarsParse(options, path.join(outputDir, path.basename(inputPath)), {
-    isPath: true,
-  }).toString()
-  const exists = await pathExists(outputPath)
-  return { inputPath, outputPathOpt, outputDir, outputPath, exists }
-}
-
-export async function copyFileTransformed(
-  options: ScaffoldConfig,
-  data: Record<string, string>,
-  {
-    exists,
-    overwrite,
-    outputPath,
-    inputPath,
-  }: { exists: boolean; overwrite: boolean; outputPath: string; inputPath: string }
-) {
-  if (!exists || overwrite) {
-    if (exists && overwrite) {
-      log(options, LogLevel.Info, `File ${outputPath} exists, overwriting`)
-    }
-    const templateBuffer = await readFile(inputPath)
-    const outputContents = handlebarsParse(options, templateBuffer)
-
-    if (!options.dryRun) {
-      await writeFile(outputPath, outputContents)
-      log(options, LogLevel.Info, "Done.")
-    } else {
-      log(options, LogLevel.Info, "Content output:")
-      log(options, LogLevel.Info, outputContents)
-    }
-  } else if (exists) {
-    log(options, LogLevel.Info, `File ${outputPath} already exists, skipping`)
-  }
-}
-
-export function getOutputDir(
-  options: ScaffoldConfig,
-  data: Record<string, string>,
-  outputPathOpt: string,
-  basePath: string
-) {
-  return path.resolve(
-    process.cwd(),
-    ...([
-      outputPathOpt,
-      basePath,
-      options.createSubFolder
-        ? options.subFolderNameHelper
-          ? handlebarsParse(options, `{{ ${options.subFolderNameHelper} name }}`)
-          : options.name
-        : undefined,
-    ].filter(Boolean) as string[])
-  )
-}
-
-export function logInputFile(
-  options: ScaffoldConfig,
-  {
-    origTemplate,
-    relPath,
-    template,
-    inputFilePath,
-    nonGlobTemplate,
-    basePath,
-    isDirOrGlob,
-    isGlob,
-  }: {
-    origTemplate: string
-    relPath: string
-    template: string
-    inputFilePath: string
-    nonGlobTemplate: string
-    basePath: string
-    isDirOrGlob: boolean
-    isGlob: boolean
-  }
-) {
-  log(
-    options,
-    LogLevel.Debug,
-    `\nprocess.cwd(): ${process.cwd()}`,
-    `\norigTemplate: ${origTemplate}`,
-    `\nrelPath: ${relPath}`,
-    `\ntemplate: ${template}`,
-    `\ninputFilePath: ${inputFilePath}`,
-    `\nnonGlobTemplate: ${nonGlobTemplate}`,
-    `\nbasePath: ${basePath}`,
-    `\nisDirOrGlob: ${isDirOrGlob}`,
-    `\nisGlob: ${isGlob}`,
-    `\n`
-  )
-}
-
-export function logInitStep(options: ScaffoldConfig) {
-  log(options, LogLevel.Debug, "Full config:", {
-    name: options.name,
-    templates: options.templates,
-    output: options.output,
-    createSubfolder: options.createSubFolder,
-    data: options.data,
-    overwrite: options.overwrite,
-    quiet: options.quiet,
-    subFolderTransformHelper: options.subFolderNameHelper,
-    helpers: Object.keys(options.helpers ?? {}),
-    verbose: `${options.verbose} (${Object.keys(LogLevel).find(
-      (k) => (LogLevel[k as any] as unknown as number) === options.verbose!
-    )})`,
-  })
-  log(options, LogLevel.Info, "Data:", options.data)
+  return template.replace(/\*/g, "").replace(/\/\//g, "/")
 }

tests/scaffold.test.ts

@@ -2,9 +2,6 @@ import mockFs from "mock-fs"
 import FileSystem from "mock-fs/lib/filesystem"
 import Scaffold from "../src/scaffold"
 import { readdirSync, readFileSync } from "fs"
-import { Console } from "console"
-import { defaultHelpers } from "../src/utils"
-import { join } from "path"
 
 const fileStructNormal = {
   input: {
@@ -22,52 +19,21 @@ const fileStructWithData = {
 
 const fileStructNested = {
   input: {
-    "{{name}}-1.txt": "This should be in root",
+    "{{name}}-1.text": "This should be in root",
     "{{Name}}": {
       "{{name}}-2.txt": "Hello, my value is {{value}}",
-      moreNesting: {
-        "{{name}}-3.txt": "Hi! My value is actually NOT {{value}}!",
-      },
     },
   },
   output: {},
 }
-const fileStructSubdirTransformer = {
-  input: {
-    "{{name}}.txt": "Hello, my app is {{name}}",
-  },
-  output: {},
-}
 
-const defaultHelperNames = Object.keys(defaultHelpers)
-const fileStructHelpers = {
-  input: {
-    defaults: defaultHelperNames.reduce<Record<string, string>>(
-      (all, cur) => ({ ...all, [cur + ".txt"]: `{{ ${cur} name }}` }),
-      {}
-    ),
-    custom: {
-      "add1.txt": "{{ add1 name }}",
-    },
-  },
-  output: {},
-}
-// let logsTemp: any = []
-// let logMock: any
 function withMock(fileStruct: FileSystem.DirectoryItems, testFn: jest.EmptyFunction): jest.EmptyFunction {
   return () => {
     beforeEach(() => {
-      // console.log("Mocking:", fileStruct)
-      console = new Console(process.stdout, process.stderr)
-
       mockFs(fileStruct)
-      // logMock = jest.spyOn(console, 'log').mockImplementation((...args) => {
-      //   logsTemp.push(args)
-      // })
     })
     testFn()
     afterEach(() => {
-      // console.log("Restoring mock")
       mockFs.restore()
     })
   }
@@ -82,9 +48,10 @@ describe("Scaffold", () => {
           name: "app_name",
           output: "output",
           templates: ["input"],
-          verbose: 0,
+          quiet: true,
         })
-        const data = readFileSync(join(process.cwd(), "output", "app_name.txt"))
+
+        const data = readFileSync(process.cwd() + "/output/app_name.txt")
         expect(data.toString()).toBe("Hello, my app is app_name")
       })
 
@@ -94,10 +61,10 @@ describe("Scaffold", () => {
           output: "output",
           templates: ["input"],
           createSubFolder: true,
-          verbose: 0,
+          quiet: true,
         })
 
-        const data = readFileSync(join(process.cwd(), "output", "app_name", "app_name.txt"))
+        const data = readFileSync(process.cwd() + "/output/app_name/app_name.txt")
         expect(data.toString()).toBe("Hello, my app is app_name")
       })
     })
@@ -112,7 +79,7 @@ describe("Scaffold", () => {
           output: "output",
           templates: ["input"],
           data: { value: "1" },
-          verbose: 0,
+          quiet: true,
         })
 
         await Scaffold({
@@ -120,10 +87,10 @@ describe("Scaffold", () => {
           output: "output",
           templates: ["input"],
           data: { value: "2" },
-          verbose: 0,
+          quiet: true,
         })
 
-        const data = readFileSync(join(process.cwd(), "output", "app_name.txt"))
+        const data = readFileSync(process.cwd() + "/output/app_name.txt")
         expect(data.toString()).toBe("Hello, my value is 1")
       })
 
@@ -133,7 +100,7 @@ describe("Scaffold", () => {
           output: "output",
           templates: ["input"],
           data: { value: "1" },
-          verbose: 0,
+          quiet: true,
         })
 
         await Scaffold({
@@ -142,10 +109,10 @@ describe("Scaffold", () => {
           templates: ["input"],
           data: { value: "2" },
           overwrite: true,
-          verbose: 0,
+          quiet: true,
         })
 
-        const data = readFileSync(join(process.cwd(), "output", "app_name.txt"))
+        const data = readFileSync(process.cwd() + "/output/app_name.txt")
         expect(data.toString()).toBe("Hello, my value is 2")
       })
     })
@@ -154,13 +121,9 @@ describe("Scaffold", () => {
   describe(
     "errors",
     withMock(fileStructNormal, () => {
-      let consoleMock1: jest.SpyInstance
+      let consoleMock: jest.SpyInstance
       beforeAll(() => {
-        consoleMock1 = jest.spyOn(console, "error").mockImplementation(() => void 0)
-      })
-
-      afterAll(() => {
-        consoleMock1.mockRestore()
+        consoleMock = jest.spyOn(console, "error").mockImplementation(() => void 0)
       })
 
       test("should throw for bad input", async () => {
@@ -170,11 +133,15 @@ describe("Scaffold", () => {
             output: "output",
             templates: ["non-existing-input"],
             data: { value: "1" },
-            verbose: 0,
+            quiet: true,
           })
         ).rejects.toThrow()
 
-        expect(() => readFileSync(join(process.cwd(), "output", "app_name.txt"))).toThrow()
+        expect(() => readFileSync(process.cwd() + "/output/app_name.txt")).toThrow()
+      })
+
+      afterAll(() => {
+        consoleMock.mockRestore()
       })
     })
   )
@@ -185,12 +152,12 @@ describe("Scaffold", () => {
       test("should allow override function", async () => {
         await Scaffold({
           name: "app_name",
-          output: (fullPath, basedir, basename) => join("custom-output", `${basename.split(".")[0]}`),
+          output: (fullPath, basedir, basename) => `custom-output/${basename.split(".")[0]}`,
           templates: ["input"],
           data: { value: "1" },
-          verbose: 0,
+          quiet: true,
         })
-        const data = readFileSync(join(process.cwd(), "/custom-output/app_name/app_name.txt"))
+        const data = readFileSync(process.cwd() + "/custom-output/app_name/app_name.txt")
         expect(data.toString()).toBe("Hello, my app is app_name")
       })
     })
@@ -202,128 +169,14 @@ describe("Scaffold", () => {
       test("should maintain input structure on output", async () => {
         await Scaffold({
           name: "app_name",
-          output: "output",
+          output: "./",
           templates: ["input"],
           data: { value: "1" },
-          verbose: 0,
+          quiet: true,
         })
 
-        const rootDir = readdirSync(join(process.cwd(), "output"))
-        const dir = readdirSync(join(process.cwd(), "output", "AppName"))
-        const nestedDir = readdirSync(join(process.cwd(), "output", "AppName", "moreNesting"))
-        expect(rootDir).toHaveProperty("length")
+        const dir = readdirSync(process.cwd())
         expect(dir).toHaveProperty("length")
-        expect(nestedDir).toHaveProperty("length")
-
-        const rootFile = readFileSync(join(process.cwd(), "output", "app_name-1.txt"))
-        const oneDeepFile = readFileSync(join(process.cwd(), "output", "AppName/app_name-2.txt"))
-        const twoDeepFile = readFileSync(join(process.cwd(), "output", "AppName/moreNesting/app_name-3.txt"))
-        expect(rootFile.toString()).toEqual("This should be in root")
-        expect(oneDeepFile.toString()).toEqual("Hello, my value is 1")
-        expect(twoDeepFile.toString()).toEqual("Hi! My value is actually NOT 1!")
-      })
-    })
-  )
-
-  describe(
-    "helpers",
-    withMock(fileStructHelpers, () => {
-      const _helpers: Record<string, (text: string) => string> = {
-        add1: (text) => text + " 1",
-      }
-
-      describe("default helpers", () => {
-        test("should work", async () => {
-          await Scaffold({
-            name: "app_name",
-            output: "output",
-            templates: ["input"],
-            verbose: 0,
-            helpers: _helpers,
-          })
-
-          const results = {
-            camelCase: "appName",
-            snakeCase: "app_name",
-            startCase: "App Name",
-            kebabCase: "app-name",
-            hyphenCase: "app-name",
-            pascalCase: "AppName",
-            lowerCase: "app_name",
-            upperCase: "APP_NAME",
-          }
-          for (const key in results) {
-            const file = readFileSync(join(process.cwd(), "output", "defaults", `${key}.txt`))
-            expect(file.toString()).toEqual(results[key as keyof typeof results])
-          }
-        })
-      })
-      describe("custom helpers", () => {
-        test("should work", async () => {
-          await Scaffold({
-            name: "app_name",
-            output: "output",
-            templates: ["input"],
-            verbose: 0,
-            helpers: _helpers,
-          })
-
-          const results = {
-            add1: "app_name 1",
-          }
-          for (const key in results) {
-            const file = readFileSync(join(process.cwd(), "output", "custom", `${key}.txt`))
-            expect(file.toString()).toEqual(results[key as keyof typeof results])
-          }
-        })
-      })
-    })
-  )
-  describe(
-    "transform subfolder",
-    withMock(fileStructSubdirTransformer, () => {
-      test("should work with no helper", async () => {
-        await Scaffold({
-          name: "app_name",
-          output: "output",
-          templates: ["input"],
-          createSubFolder: true,
-          verbose: 0,
-        })
-
-        const data = readFileSync(join(process.cwd(), "output", "app_name/app_name.txt"))
-        expect(data.toString()).toBe("Hello, my app is app_name")
-      })
-
-      test("should work with default helper", async () => {
-        await Scaffold({
-          name: "app_name",
-          output: "output",
-          templates: ["input"],
-          createSubFolder: true,
-          verbose: 0,
-          subFolderNameHelper: "upperCase",
-        })
-
-        const data = readFileSync(join(process.cwd(), "output", "APP_NAME/app_name.txt"))
-        expect(data.toString()).toBe("Hello, my app is app_name")
-      })
-
-      test("should work with custom helper", async () => {
-        await Scaffold({
-          name: "app_name",
-          output: "output",
-          templates: ["input"],
-          createSubFolder: true,
-          verbose: 0,
-          subFolderNameHelper: "test",
-          helpers: {
-            test: () => "REPLACED",
-          },
-        })
-
-        const data = readFileSync(join(process.cwd(), "output", "REPLACED/app_name.txt"))
-        expect(data.toString()).toBe("Hello, my app is app_name")
       })
     })
   )

tests/utils.test.ts

@@ -1,54 +0,0 @@
-import { handlebarsParse } from "../src/utils"
-import { ScaffoldConfig } from "../src/types"
-import path from "path"
-
-const blankConf: ScaffoldConfig = {
-  verbose: 0,
-  name: "",
-  output: "",
-  templates: [],
-  data: { name: "test" },
-}
-
-describe("Utils", () => {
-  describe("handlebarsParse", () => {
-    let origSep: any
-    describe("windows paths", () => {
-      beforeAll(() => {
-        origSep = path.sep
-        Object.defineProperty(path, "sep", { value: "\\" })
-      })
-      afterAll(() => {
-        Object.defineProperty(path, "sep", { value: origSep })
-      })
-      test("should work for windows paths", async () => {
-        expect(handlebarsParse(blankConf, "C:\\exports\\{{name}}.txt", { isPath: true })).toEqual(
-          "C:\\exports\\test.txt"
-        )
-      })
-    })
-    describe("non-windows paths", () => {
-      beforeAll(() => {
-        origSep = path.sep
-        Object.defineProperty(path, "sep", { value: "/" })
-      })
-      afterAll(() => {
-        Object.defineProperty(path, "sep", { value: origSep })
-      })
-      test("should work for non-windows paths", async () => {
-        expect(handlebarsParse(blankConf, "/home/test/{{name}}.txt", { isPath: true })).toEqual("/home/test/test.txt")
-      })
-    })
-    test("should not do path escaping on non-path compiles", async () => {
-      expect(
-        handlebarsParse(
-          { ...blankConf, data: { ...blankConf.data, escaped: "value" } },
-          "/home/test/{{name}} \\{{escaped}}.txt",
-          {
-            isPath: false,
-          }
-        )
-      ).toEqual("/home/test/test {{escaped}}.txt")
-    })
-  })
-})

yarn.lock

@@ -716,9 +716,9 @@ ansi-escapes@^4.2.1:
     type-fest "^0.21.3"
 
 ansi-regex@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
-  integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
+  integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
 
 ansi-styles@^3.2.1:
   version "3.2.1"
@@ -932,7 +932,7 @@ chalk@2.4.2, chalk@^2.0.0:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@^4.0.0:
+chalk@^4.0.0, chalk@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad"
   integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==
@@ -2161,12 +2161,12 @@ makeerror@1.0.x:
   dependencies:
     tmpl "1.0.x"
 
-massarg@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/massarg/-/massarg-1.0.5.tgz#3dfd49bb63bfca4b0371a2f0ffc7580a9a6cc7a0"
-  integrity sha512-gkJHZsNfeMurpVPKojCiT2lnG2cSxHPAXZSg+gCLIgCf5bGn7pKOsoeu4qVAc5mlBxV2l/hA1yojt+ZsJd8SDg==
+massarg@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/massarg/-/massarg-1.0.3.tgz#228cf2d84896924b6b12021ea23ed9a9077e15b7"
+  integrity sha512-LYb4XvAQ+PbBClyfkn9B4JtfwycfpnOnGIznALt9YLnrmQaCcXXJBQsG5SA/2w+bmLOeYRoR9GqqFLyaniCn9g==
   dependencies:
-    chalk "^4.1.2"
+    chalk "^4.1.1"
     lodash "^4.17.21"
 
 merge-stream@^2.0.0: