unify behavior of commands and cli with regards to local templates/re…

…cipes

e2e/fixtures/local-use/recipe/.tmplr.yml

@@ -0,0 +1,6 @@
+steps:
+  - read: name
+    eval: World
+
+  - copy: ./halo.txt
+    to: ../halo.txt

e2e/fixtures/local-use/recipe/halo.txt

@@ -0,0 +1 @@
+Halo {{tmplr.name}}!

e2e/fixtures/local/template/.tmplr.yml

@@ -0,0 +1,5 @@
+steps:
+  - read: name
+    eval: World
+
+  - update: ./halo.txt

e2e/fixtures/local/template/halo.txt

@@ -0,0 +1 @@
+Halo {{ tmplr.name }}!

e2e/local.test.mjs

@@ -0,0 +1,15 @@
+import { scenario } from './util.mjs'
+
+
+scenario('local', async (run, { ls, read }) => {
+  await run('local:../template')
+  expect(await ls()).toIncludeSameMembers([ '.tmplr.yml', 'halo.txt' ])
+  expect(await read('halo.txt')).toBe('Halo World!')
+}, { root: 'target' })
+
+
+scenario('local-use', async (run, { ls, read }) => {
+  await run('use', 'local:../recipe')
+  expect(await ls()).toIncludeSameMembers([ 'halo.txt' ])
+  expect(await read('halo.txt')).toBe('Halo World!')
+}, { root: 'target' })

e2e/util.mjs

@@ -7,7 +7,10 @@ import { execa, $ } from 'execa'
 import { getBinPath } from 'get-bin-path'
 
 
-export function scenario(name, testFn) {
+export function scenario(name, testFn, options) {
+  options ??= {}
+  options.root ??= '.'
+
   test('scenario: ' + name, async () => {
     const fixsrc = name.split(':')[0]
     const fixture = join('e2e', 'fixtures', fixsrc)
@@ -19,9 +22,10 @@ export function scenario(name, testFn) {
     const dir = await mkdtemp('test-')
     await cp(fixture, dir, { recursive: true })
 
-    const cmd = $({ cwd: dir })
+    const cwd = join(dir, options.root)
+    const cmd = $({ cwd })
     const bin = await getBinPath()
-    const run = (...args) => execa(bin, args, { cwd: dir })
+    const run = (...args) => execa(bin, args, { cwd })
 
     try {
       await testFn(run, {
@@ -32,7 +36,7 @@ export function scenario(name, testFn) {
           return stdout.split('\n').filter(x => x !== '.' && x !== '..')
         },
         read: async file => {
-          return await readFile(join(dir, file), 'utf8')
+          return await readFile(join(cwd, file), 'utf8')
         }
       })
     } finally {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tmplr",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "description": "Easy templating for repositories",
   "bin": "dist/src/index.js",
   "engines": {
@@ -36,7 +36,7 @@
   "homepage": "https://github.com/loreanvictor/tmplr#readme",
   "dependencies": {
     "@tmplr/core": "^0.7.4",
-    "@tmplr/node": "^0.2.0",
+    "@tmplr/node": "^0.2.2",
     "@tmplr/react": "^0.1.6",
     "@tmplr/yaml-parser": "^0.1.8",
     "chalk": "^4.1.2",

src/app/template/env.ts

@@ -1,25 +1,17 @@
 import { useAsync } from 'react-use'
-import { cp, mkdir } from 'fs/promises'
+import { mkdir } from 'fs/promises'
 
 import { createRuntime } from '../runtime'
-import { degitAndRun, runLocalRecipe } from '../../recipes'
+import { degitAndRun } from '../../recipes'
 
 
 export function useTemplateEnv(workdir: string, target: string) {
   const { value, loading, error } = useAsync(async () => {
-    const local = target.startsWith('local:')
-    const path = local ? target.slice(6) : target
-
     await mkdir(workdir, { recursive: true })
-    if (local) {
-      await cp(path, workdir, { recursive: true })
-    }
 
     return createRuntime(
       workdir,
-      async () => {
-        return local ? runLocalRecipe() : degitAndRun(target)
-      }
+      async () => degitAndRun(target)
     )
   })
 

src/app/use/env.ts

@@ -1,29 +1,15 @@
 import { useAsync } from 'react-use'
-import { join } from 'path'
-import { access, mkdir, cp } from 'fs/promises'
+import { access } from 'fs/promises'
 
 import { createRuntime } from '../runtime'
-import { useRecipe, runAndClean } from '../../recipes'
+import { useRecipe } from '../../recipes'
 
 
 export function useUseEnv(workdir: string, target: string) {
   const {value, loading, error} = useAsync(async () => {
-    const local = target.startsWith('local:')
+    await access(workdir)
 
-    if (local) {
-      const path = local ? target.slice(6) : target
-      const dirname = '.use-' + Math.random().toString(36).slice(2)
-      const recipedir = join(workdir, dirname)
-
-      await mkdir(recipedir, { recursive: true })
-      await cp(path, recipedir, { recursive: true })
-
-      return await createRuntime(workdir, async () => runAndClean(join(dirname, '.tmplr.yml')))
-    } else {
-      await access(workdir)
-
-      return await createRuntime(workdir, async () => useRecipe(target))
-    }
+    return await createRuntime(workdir, async () => useRecipe(target))
   }, [workdir, target])
 
   return { runtime: value, loading, error }

tsconfig.json

@@ -1,7 +1,7 @@
 {
 	"extends": "@sindresorhus/tsconfig",
 	"compilerOptions": {
-		"module": "commonjs",
+		"module": "Node16",
 		"moduleResolution": "Node16",
 		"jsx": "react",
 		"esModuleInterop": true,