@trayio/generator 5.34.0 → 5.35.0-unstable.fd7158a

package/dist/generator/Generator.d.ts

@@ -1,5 +1,5 @@
-import * as TE from 'fp-ts/TaskEither';
+import { Effect } from 'effect';
 export interface Generator {
-    generate(templatePath: string, targetPath: string, values: Record<string, string>): TE.TaskEither<Error, undefined>;
+    generate(templatePath: string, targetPath: string, values: Record<string, string>): Effect.Effect<undefined, Error>;
 }
 //# sourceMappingURL=Generator.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Generator.d.ts","sourceRoot":"","sources":["../../src/generator/Generator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAEvC,MAAM,WAAW,SAAS;IACzB,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,CAAC;CACnC"}
+{"version":3,"file":"Generator.d.ts","sourceRoot":"","sources":["../../src/generator/Generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,MAAM,WAAW,SAAS;IACzB,QAAQ,CACP,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC5B,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;CACnC"}

package/dist/generator/NodeFsGenerator.d.ts

@@ -1,7 +1,7 @@
-import * as TE from 'fp-ts/TaskEither';
+import { Effect } from 'effect';
 import { Generator } from './Generator';
 export declare class NodeFsGenerator implements Generator {
-    generate(templatePath: string, targetPath: string, values: Record<string, string>): TE.TaskEither<Error, undefined>;
+    generate(templatePath: string, targetPath: string, values: Record<string, string>): Effect.Effect<undefined, Error>;
     private replacePlaceholdersInDir;
     private renameParentDir;
     private replacePlaceholdersInFile;

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;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"}
+{"version":3,"file":"NodeFsGenerator.d.ts","sourceRoot":"","sources":["../../src/generator/NodeFsGenerator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAQ,MAAM,QAAQ,CAAC;AAOtC,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,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC;IAyBlC,OAAO,CAAC,wBAAwB,CA0B9B;IAEF,OAAO,CAAC,eAAe,CAsCrB;IAEF,OAAO,CAAC,yBAAyB,CAe/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

@@ -15,26 +15,34 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NodeFsGenerator = void 0;
+const effect_1 = require("effect");
 const fs = __importStar(require("fs/promises"));
 const path_1 = require("path");
-const TE = __importStar(require("fp-ts/TaskEither"));
-const Task_1 = require("@trayio/commons/task/Task");
-const function_1 = require("fp-ts/function");
+const EffectExtensions_1 = require("@trayio/commons/effect/EffectExtensions");
 const fse = __importStar(require("fs-extra"));
-const Array_1 = require("fp-ts/Array");
 const extract = require("extract-zip");
 class NodeFsGenerator {
     generate(templatePath, targetPath, values) {
-        return (0, function_1.pipe)(this.readStats(templatePath), TE.chain((stats) => {
+        return (0, effect_1.pipe)(this.readStats(templatePath), effect_1.Effect.flatMap((stats) => {
             if (stats.isDirectory()) {
                 return this.copy(templatePath, targetPath);
             }
@@ -42,12 +50,12 @@ class NodeFsGenerator {
                 const unzip = this.unzip(templatePath, targetPath);
                 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.renameParentDir(targetPath, values)), TE.chain((parentDirName) => this.replacePlaceholdersInDir(parentDirName, values)), TE.map(() => undefined));
+            return effect_1.Effect.fail(new Error('Unknown file type. Template path needs to be either a directory or a zip file'));
+        }), effect_1.Effect.flatMap(() => this.renameParentDir(targetPath, values)), effect_1.Effect.flatMap((parentDirName) => this.replacePlaceholdersInDir(parentDirName, values)), effect_1.Effect.map(() => undefined));
     }
     replacePlaceholdersInDir = (dirPath, values) => {
         const targetPath = this.replacePlaceholdersInContent(dirPath, values);
-        return (0, function_1.pipe)(this.rename(dirPath, targetPath), TE.chain(() => this.readDir(targetPath)), TE.chain((direntList) => (0, Array_1.traverse)(TE.ApplicativeSeq)((dirent) => {
+        return (0, effect_1.pipe)(this.rename(dirPath, targetPath), effect_1.Effect.flatMap(() => this.readDir(targetPath)), effect_1.Effect.flatMap((direntList) => effect_1.Effect.forEach((dirent) => {
             const fileOrDirPath = (0, path_1.join)(targetPath, dirent.name);
             if (dirent.isDirectory()) {
                 return this.replacePlaceholdersInDir(fileOrDirPath, values);
@@ -55,27 +63,27 @@ class NodeFsGenerator {
             if (dirent.isFile()) {
                 return this.replacePlaceholdersInFile(fileOrDirPath, values);
             }
-            return TE.left(new Error('Unknown file type. Template directory should contain either folders or files'));
-        })(direntList)), TE.map(() => undefined));
+            return effect_1.Effect.fail(new Error('Unknown file type. Template directory should contain either folders or files'));
+        })(direntList)), effect_1.Effect.map(() => undefined));
     };
     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) => {
+        return (0, effect_1.pipe)(this.readDir(targetPath), effect_1.Effect.flatMap((direntList) => effect_1.Effect.succeed(direntList.filter((dirent) => regex.test(dirent.name)))), effect_1.Effect.flatMap((direntList) => {
             if (direntList.length === 0) {
-                return TE.right(targetPath);
+                return effect_1.Effect.succeed(targetPath);
             }
             if (direntList.length > 1) {
-                return TE.left(new Error('More than one parent directory found. This is not allowed'));
+                return effect_1.Effect.fail(new Error('More than one parent directory found. This is not allowed'));
             }
-            return TE.right(`${targetPath}/${direntList[0].name}`);
-        }), TE.chain((parentDirName) => {
+            return effect_1.Effect.succeed(`${targetPath}/${direntList[0].name}`);
+        }), effect_1.Effect.flatMap((parentDirName) => {
             const replacedParentDirName = this.replacePlaceholdersInContent(parentDirName, values);
-            return (0, function_1.pipe)(this.rename(parentDirName, replacedParentDirName), TE.map(() => replacedParentDirName));
+            return (0, effect_1.pipe)(this.rename(parentDirName, replacedParentDirName), effect_1.Effect.map(() => replacedParentDirName));
         }));
     };
     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)));
+        return (0, effect_1.pipe)(this.rename(filePath, targetPath), effect_1.Effect.flatMap(() => this.readFile(targetPath)), effect_1.Effect.map((fileContent) => this.replacePlaceholdersInContent(fileContent, values)), effect_1.Effect.flatMap((replacedContent) => this.writeFile(targetPath, replacedContent)));
     };
     replacePlaceholdersInContent = (templateContent, replacements) => {
         let content = templateContent;
@@ -85,17 +93,17 @@ class NodeFsGenerator {
         });
         return content;
     };
-    readStats = (path) => (0, Task_1.createTaskEitherFromPromiseWithSimpleError)(() => fs.lstat(path));
-    readDir = (path) => (0, Task_1.createTaskEitherFromPromiseWithSimpleError)(() => fs.readdir(path, { withFileTypes: true }));
-    readFile = (path) => (0, Task_1.createTaskEitherFromPromiseWithSimpleError)(() => fs.readFile(path, 'utf-8'));
-    writeFile = (targetPath, generatedContent) => (0, function_1.pipe)((0, Task_1.createTaskEitherFromPromiseWithSimpleError)(() => fs.writeFile(targetPath, generatedContent)), TE.map(() => undefined));
-    rename = (oldPath, newPath) => (0, function_1.pipe)((0, Task_1.createTaskEitherFromPromiseWithSimpleError)(() => fse.rename(oldPath, newPath)), TE.map(() => undefined));
-    copy = (source, targetPath) => (0, function_1.pipe)((0, Task_1.createTaskEitherFromPromiseWithSimpleError)(() => fse.copy(source, targetPath)), TE.map(() => undefined));
-    unzip = (source, targetPath) => (0, function_1.pipe)((0, Task_1.createTaskEitherFromPromiseWithSimpleError)(() => {
+    readStats = (path) => EffectExtensions_1.EffectExtensions.tryPromiseWithSimpleError(() => fs.lstat(path));
+    readDir = (path) => EffectExtensions_1.EffectExtensions.tryPromiseWithSimpleError(() => fs.readdir(path, { withFileTypes: true }));
+    readFile = (path) => EffectExtensions_1.EffectExtensions.tryPromiseWithSimpleError(() => fs.readFile(path, 'utf-8'));
+    writeFile = (targetPath, generatedContent) => (0, effect_1.pipe)(EffectExtensions_1.EffectExtensions.tryPromiseWithSimpleError(() => fs.writeFile(targetPath, generatedContent)), effect_1.Effect.map(() => undefined));
+    rename = (oldPath, newPath) => (0, effect_1.pipe)(EffectExtensions_1.EffectExtensions.tryPromiseWithSimpleError(() => fse.rename(oldPath, newPath)), effect_1.Effect.map(() => undefined));
+    copy = (source, targetPath) => (0, effect_1.pipe)(EffectExtensions_1.EffectExtensions.tryPromiseWithSimpleError(() => fse.copy(source, targetPath)), effect_1.Effect.map(() => undefined));
+    unzip = (source, targetPath) => (0, effect_1.pipe)(EffectExtensions_1.EffectExtensions.tryPromiseWithSimpleError(() => {
         const extracted = extract(source, {
             dir: targetPath,
         });
         return extracted;
-    }), TE.map(() => undefined));
+    }), effect_1.Effect.map(() => undefined));
 }
 exports.NodeFsGenerator = NodeFsGenerator;

package/dist/generator/NodeFsGenerator.unit.test.js

@@ -15,14 +15,25 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
+const effect_1 = require("effect");
 const fs = __importStar(require("fs"));
 const path_1 = require("path");
 const extract = require("extract-zip");
@@ -52,7 +63,7 @@ const contentTest = (outputPath, values) => {
     const fileContent = fs.readFileSync(filePath, 'utf-8');
     const expectedContent = `import { RequestHandler } from '@trayio/base-contract/base/Facade';
 import { TypeCodec } from '@trayio/commons/codec/TypeCodec';
-import * as t from 'io-ts';
+import { Schema } from 'effect';
 
 export interface ${values.entity}Facade {
 	get${values.entity}: RequestHandler<Get${values.entity}, ${values.entity}>;
@@ -72,22 +83,22 @@ export type ${values.entity} = {
 	description: string;
 };
 
-export const get${values.entity}Codec = new TypeCodec<Get${values.entity}>(
-	t.type({
-		id: t.string,
+export const get${values.entity}Codec = TypeCodec.fromSchema(
+	Schema.Struct({
+		id: Schema.String,
 	})
 );
 
-export const create${values.entity}Codec = new TypeCodec<Create${values.entity}>(
-	t.type({
-		description: t.string,
+export const create${values.entity}Codec = TypeCodec.fromSchema(
+	Schema.Struct({
+		description: Schema.String,
 	})
 );
 
-export const ${values.entityVar}Codec = new TypeCodec<${values.entity}>(
-	t.type({
-		id: t.string,
-		description: t.string,
+export const ${values.entityVar}Codec = TypeCodec.fromSchema(
+	Schema.Struct({
+		id: Schema.String,
+		description: Schema.String,
 	})
 );
 `;
@@ -126,7 +137,7 @@ describe('NodeFsGenerator', () => {
         });
         it('Should extract all content of the template', async () => {
             const generator = new NodeFsGenerator_1.NodeFsGenerator();
-            await generator.generate(zipTemplatePath, zipOutputPath, values)();
+            await effect_1.Effect.runPromise(effect_1.Effect.either(generator.generate(zipTemplatePath, zipOutputPath, values)));
         });
         it('should output template and rename files/folders according to user input', () => {
             outputTest(zipOutputPath, values);
@@ -147,7 +158,7 @@ describe('NodeFsGenerator', () => {
         unzip(zipTemplatePath, folderTemplatePath);
         it('Should copy all content of the template', async () => {
             const generator = new NodeFsGenerator_1.NodeFsGenerator();
-            const result = await generator.generate(folderTemplatePath, folderOutputPath, values)();
+            const result = await effect_1.Effect.runPromise(effect_1.Effect.either(generator.generate(folderTemplatePath, folderOutputPath, values)));
         });
         it('should output template and rename files/folders according to user input', () => {
             outputTest(folderOutputPath, values);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trayio/generator",
-  "version": "5.34.0",
+  "version": "5.35.0-unstable.fd7158a",
   "description": "Template based generator",
   "author": "Tray.io",
   "license": "MIT",
@@ -11,9 +11,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@trayio/commons": "5.34.0",
+    "@trayio/commons": "5.35.0-unstable.fd7158a",
+    "effect": "3.22.2",
     "extract-zip": "2.0.1",
-    "fp-ts": "2.12.3",
     "fs-extra": "11.3.4"
   },
   "exports": {
@@ -30,9 +30,7 @@
   "files": [
     "/dist"
   ],
-  "devDependencies": {
-    "io-ts": "2.2.20"
-  },
+  "devDependencies": {},
   "scripts": {
     "clean": "rm -rf dist tsconfig.tsbuildinfo",
     "compile": "tsc --build && tscp",