Merge pull request #4 from steve-lebleu/feature/extract-templates

Feature: extract templates
steve-lebleu · Feb 16, 2024 · bdbf71e · bdbf71e
2 parents 3ff5b66 + f86c6f9
commit bdbf71e
Show file tree

Hide file tree

Showing 20 changed files with 20 additions and 35 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -50,7 +50,7 @@ jobs:
         with:
           node-version: '18.19.0'
       - name: Create release
-        uses: konfer-be/action-create-release-from-tag@v1.0.2
+        uses: konfer-be/action-create-release-from-tag@v1.0.12
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
   publish:

diff --git a/.gitignore b/.gitignore
@@ -1,11 +1,11 @@
 *-debug.log
 *-error.log
-.nyc_output/
-.vscode/
-node_modules/
-dist/
-lib/
-bin/
-tmp/
-reports/
+.nyc_output
+.vscode
+node_modules
+dist
+lib
+bin
+tmp
+reports
 yarn.lock
diff --git a/README.md b/README.md
@@ -1,14 +1,10 @@
 ![Github action workflow status](https://github.com/steve-lebleu/rsgen/actions/workflows/build.yml/badge.svg?branch=master)
-[![Coverage Status](https://coveralls.io/repos/github/konfer-be/rsgen/badge.svg?branch=master)](https://coveralls.io/github/konfer-be/rsgen?branch=master)
+[![Coverage Status](https://coveralls.io/repos/github/steve-lebleu/rsgen/badge.svg?branch=master)](https://coveralls.io/github/steve-lebleu/rsgen?branch=master)
 ![Known Vulnerabilities](https://snyk.io/test/github/steve-lebleu/rsgen/badge.svg)
 ![GitHub Release](https://img.shields.io/github/v/release/steve-lebleu/rsgen?logo=Github)
 [![MIT Licence](https://badges.frapsoft.com/os/mit/mit.svg?v=103)](https://opensource.org/licenses/mit-license.php)
 
-Naive modular resource generation for :point_right: [Typeplate](https://github.com/steve-lebleu/ts-express-typeorm) project.
-
-## > Why ?
-
-Obviously to improve the time passed on low value-added tasks . :clock1: :muscle:
+Naive modular resource generation for :point_right: [Typeplate](https://github.com/steve-lebleu/typeplate) project.
 
 ## > How to ?
 
@@ -20,15 +16,15 @@ $ npm install -g rsgen
 
 ### Generate
 
-Go to the project folder:
+Go to project folder:
 
 ```bash
 $ cd path-to-the-root-of-your-typeplate-project
 ```
 
-Generate your resource module or core member:
+Generate resource module or core member:
 
-#### CLI short way
+#### Short way
 
 ```bash
 $ rsgen <name> [<target>] [<permissions>]
@@ -38,7 +34,7 @@ $ rsgen <name> [<target>] [<permissions>]
 - **target** :  -c (core) or -r (resource). Default: -r
 - **permissions** : -p=[a,u,g]|[admin,user,ghost]. Default: admin
 
-#### CLI interactive way
+#### Interactive way
 
 ```bash
 $ rsgen

diff --git a/ROADMAP.md b/ROADMAP.md
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -10,9 +10,6 @@
     "node": ">=18.19.0",
     "npm": ">=10.2.3"
   },
-  "directories": {
-    "lib": "lib"
-  },
   "publishConfig": {
     "access": "public"
   },

diff --git a/templates/business.service.txt → src/templates/business.service.txt b/templates/business.service.txt → src/templates/business.service.txt
diff --git a/templates/controller.txt → src/templates/controller.txt b/templates/controller.txt → src/templates/controller.txt
diff --git a/templates/data-layer.service.txt → src/templates/data-layer.service.txt b/templates/data-layer.service.txt → src/templates/data-layer.service.txt
diff --git a/templates/fixture.txt → src/templates/fixture.txt b/templates/fixture.txt → src/templates/fixture.txt
diff --git a/templates/model.txt → src/templates/model.txt b/templates/model.txt → src/templates/model.txt
diff --git a/templates/query-string.interface.txt → src/templates/query-string.interface.txt b/templates/query-string.interface.txt → src/templates/query-string.interface.txt
diff --git a/templates/repository.txt → src/templates/repository.txt b/templates/repository.txt → src/templates/repository.txt
diff --git a/templates/request.interface.txt → src/templates/request.interface.txt b/templates/request.interface.txt → src/templates/request.interface.txt
diff --git a/templates/route.txt → src/templates/route.txt b/templates/route.txt → src/templates/route.txt
diff --git a/templates/subscriber.txt → src/templates/subscriber.txt b/templates/subscriber.txt → src/templates/subscriber.txt
diff --git a/templates/test.txt → src/templates/test.txt b/templates/test.txt → src/templates/test.txt
diff --git a/templates/validation.txt → src/templates/validation.txt b/templates/validation.txt → src/templates/validation.txt
diff --git a/src/utils/file.util.ts b/src/utils/file.util.ts
@@ -51,7 +51,7 @@ const write = async ({...args}) => {
 
   const { isModule, template, patterns, lowerCase } = args;
 
-  const tpl = fs.readFileSync(`${__dirname}/../../templates/${template.name}.txt`, 'utf-8');
+  const tpl = fs.readFileSync(`${process.cwd()}/src/templates/${template.name}.txt`, 'utf-8');
 
   const output = patterns.reduce( (acc, current) => {
     return acc.replace(current.regex, current.value);

diff --git a/test/01-package.unit.test.js b/test/01-package.unit.test.js
@@ -14,12 +14,6 @@ describe('Package', () => {
       expect(fs.existsSync(`${process.cwd()}/bin/rsgen.js`)).to.be.true;
     });
 
-    ['controller', 'model', 'repository', 'route', 'test', 'validation', 'business.service', 'data-layer.service', 'query-string.interface', 'request.interface', 'subscriber'].forEach(pattern => {
-      it(`should expose a template ${pattern}`, () => {
-        expect(fs.existsSync(`${process.cwd()}/templates/${pattern}.txt`)).to.be.true;
-      });
-    });
-
   });
 
 });