@trayio/generator 2.11.0 → 2.12.0

package/dist/generator/NodeFsGenerator.d.ts

@@ -3,6 +3,7 @@ import { Generator } from './Generator';
 export declare class NodeFsGenerator implements Generator {
     generate(templatePath: string, targetPath: string, values: Record<string, string>): TE.TaskEither<Error, undefined>;
     private replacePlaceholdersInDir;
+    private renameParentDir;
     private replacePlaceholdersInFile;
     private replacePlaceholdersInContent;
     private readStats;

package/dist/generator/NodeFsGenerator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NodeFsGenerator.d.ts","sourceRoot":"","sources":["../../src/generator/NodeFsGenerator.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAOvC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,qBAAa,eAAgB,YAAW,SAAS;IAChD,QAAQ,CACP,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC5B,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,SAAS,CAAC;IAsBlC,OAAO,CAAC,wBAAwB,CA0B9B;IAEF,OAAO,CAAC,yBAAyB,CAa/B;IAEF,OAAO,CAAC,4BAA4B,CAUlC;IAEF,OAAO,CAAC,SAAS,CACiD;IAElE,OAAO,CAAC,OAAO,CAGZ;IAEH,OAAO,CAAC,QAAQ,CAGb;IAEH,OAAO,CAAC,SAAS,CASd;IAEH,OAAO,CAAC,MAAM,CASX;IAEH,OAAO,CAAC,IAAI,CAST;IAEH,OAAO,CAAC,KAAK,CAYV;CACH"}
+{"version":3,"file":"NodeFsGenerator.d.ts","sourceRoot":"","sources":["../../src/generator/NodeFsGenerator.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAOvC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,qBAAa,eAAgB,YAAW,SAAS;IAChD,QAAQ,CACP,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC5B,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,SAAS,CAAC;IAyBlC,OAAO,CAAC,wBAAwB,CA0B9B;IAEF,OAAO,CAAC,eAAe,CAsCrB;IAEF,OAAO,CAAC,yBAAyB,CAa/B;IAEF,OAAO,CAAC,4BAA4B,CAUlC;IAEF,OAAO,CAAC,SAAS,CACiD;IAElE,OAAO,CAAC,OAAO,CAGZ;IAEH,OAAO,CAAC,QAAQ,CAGb;IAEH,OAAO,CAAC,SAAS,CASd;IAEH,OAAO,CAAC,MAAM,CASX;IAEH,OAAO,CAAC,IAAI,CAST;IAEH,OAAO,CAAC,KAAK,CAYV;CACH"}

package/dist/generator/NodeFsGenerator.js

@@ -47,6 +47,21 @@ class NodeFsGenerator {
                 return TE.left(new Error('Unknown file type. Template directory should contain either folders or files'));
             })(direntList)), TE.map(() => undefined));
         };
+        this.renameParentDir = (targetPath, values) => {
+            const regex = /\$(.*?)\$/g;
+            return (0, function_1.pipe)(this.readDir(targetPath), TE.chain((direntList) => TE.right(direntList.filter((dirent) => regex.test(dirent.name)))), TE.chain((direntList) => {
+                if (direntList.length === 0) {
+                    return TE.right(targetPath);
+                }
+                if (direntList.length > 1) {
+                    return TE.left(new Error('More than one parent directory found. This is not allowed'));
+                }
+                return TE.right(`${targetPath}/${direntList[0].name}`);
+            }), TE.chain((parentDirName) => {
+                const replacedParentDirName = this.replacePlaceholdersInContent(parentDirName, values);
+                return (0, function_1.pipe)(this.rename(parentDirName, replacedParentDirName), TE.map(() => replacedParentDirName));
+            }));
+        };
         this.replacePlaceholdersInFile = (filePath, values) => {
             const targetPath = this.replacePlaceholdersInContent(filePath, values);
             return (0, function_1.pipe)(this.rename(filePath, targetPath), TE.chain(() => this.readFile(targetPath)), TE.map((fileContent) => this.replacePlaceholdersInContent(fileContent, values)), TE.chain((replacedContent) => this.writeFile(targetPath, replacedContent)));
@@ -82,7 +97,7 @@ class NodeFsGenerator {
                 return unzip;
             }
             return TE.left(new Error('Unknown file type. Template path needs to be either a directory or a zip file'));
-        }), TE.chain(() => this.replacePlaceholdersInDir(targetPath, values)), TE.map(() => undefined));
+        }), TE.chain(() => this.renameParentDir(targetPath, values)), TE.chain((parentDirName) => this.replacePlaceholdersInDir(parentDirName, values)), TE.map(() => undefined));
     }
 }
 exports.NodeFsGenerator = NodeFsGenerator;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trayio/generator",
-  "version": "2.11.0",
+  "version": "2.12.0",
   "description": "Template based generator",
   "author": "Tray.io",
   "license": "MIT",
@@ -11,7 +11,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@trayio/commons": "2.11.0",
+    "@trayio/commons": "2.12.0",
     "extract-zip": "2.0.1",
     "fs-extra": "11.1.0"
   },