Merge pull request #30 from duplojs/develop

[publish] 1.2.8

README.md

@@ -52,9 +52,9 @@ const outputData = zodAccelerateSchema.parse(inputData);
 ## Implémentation dans duplojs
 ```ts
 import Duplo, {zod} from "@duplojs/duplojs";
-import {ZodAccelerator} from "@duplojs/zod-accelerator";
+import duploZodAccelerator from "@duplojs/zod-accelerator/duplo";
 
 const duplo = Duplo({port: 1506, host: "localhost", environment: "DEV"});
 
-duplo.use(ZodAccelerator.duplojs, {DEV: true});
+duplo.use(duploZodAccelerator, {DEV: true});
 ```

duplo.d.ts

@@ -0,0 +1,4 @@
+import duploZodAccelerator from "./types/duplo";
+export * from "./types/duplo";
+
+export default duploZodAccelerator;

package.json

@@ -10,15 +10,23 @@
     "json-schema",
     "parser",
     "validate",
-    "typecheck"
+    "typecheck",
+	"zod",
+	"faster",
+	"zod faster"
   ],
   "types": "./types/index.d.ts",
   "exports": {
-    "default": {
+    ".": {
       "import": "./dist/index.mjs",
       "require": "./dist/index.cjs",
 	  "types": "./types/index.d.ts"
-    }
+    },
+	"./duplo": {
+	  "types": "./duplo.d.ts",
+	  "import": "./dist/duplo.mjs",
+	  "require": "./dist/duplo.cjs"
+	}
   },
   "files": [
     "dist",
@@ -35,7 +43,7 @@
     "test:types": "tsc"
   },
   "dependencies": {
-    "@duplojs/duplojs": ">=1.1.11 <2.0.0",
+    "@duplojs/duplojs": ">=1.8.20 <2.0.0",
     "@duplojs/editor-tools": "^1.1.3 <2.0.0",
     "zod": "^3.22.4"
   },

rollup.config.mjs

@@ -24,4 +24,25 @@ export default defineConfig([
 			json(),
 		]
 	},
+	{
+		input: "scripts/duplo.ts",
+		output: [
+			{
+				file: "dist/duplo.mjs",
+				format: "esm"
+			},
+			{
+				file: "dist/duplo.cjs",
+				format: "cjs",
+			}
+		],
+		plugins: [
+			typescript({
+				exclude: ["node_mudules"],
+				tsconfig: "tsconfig.json",
+				module: "ESNext",
+			}),
+			json(),
+		]
+	},
 ]);

scripts/duplo.ts

@@ -0,0 +1,78 @@
+import * as zod from "zod";
+import {AbstractRoute, DuploConfig, DuploInstance, Process, Route} from "@duplojs/duplojs";
+import {duploExtends, duploInject} from "@duplojs/editor-tools";
+import packageJson from "../package.json";
+import {ZodAccelerator} from ".";
+import {ZodAcceleratorError} from "./lib/error";
+
+export * from "./lib/accelerator";
+export * from "./lib/error";
+export * from "./lib/parser";
+
+declare module "@duplojs/duplojs" {
+	interface Plugins {
+		"@duplojs/zod-accelerator": {version: string}
+	}
+}
+
+export default function duploZodAccelerator(
+	instance: DuploInstance<DuploConfig>, 
+	params: Partial<
+		Record<
+			DuploConfig["environment"], 
+			boolean
+		>
+	> = {DEV: false, PROD: true}
+){
+	const environment = instance.config.environment;
+
+	if(!params[environment]){
+		return;
+	}
+
+	instance.plugins["@duplojs/zod-accelerator"] = {version: packageJson.version};
+
+	const duploseHandler = (duplose: Route | Process | AbstractRoute) => {
+		if(Object.keys(duplose.extracted).length === 0){
+			return;
+		}
+
+		Object.entries(duplose.extracted).forEach(([key, value]) => {
+			if(!value){
+				return;
+			}
+
+			if(value instanceof zod.ZodType){
+				ZodAccelerator.build(value);
+			}
+			else {
+				Object.entries(value).forEach(([key, deepValue]) => {
+					ZodAccelerator.build(deepValue);
+				});
+			}
+		});
+
+		duploExtends(duplose, {
+			ZodAcceleratorError,
+		});
+
+		duploInject(duplose, ({}, d) => {
+			d.stringDuploseFunction = d.stringDuploseFunction.replace(
+				/\.parse\(request/g, 
+				".accelerator.parse(request"
+			);				
+			d.stringDuploseFunction = d.stringDuploseFunction.replace(
+				/error instanceof this\.ZodError/, 
+				"error instanceof this.extensions.ZodAcceleratorError"
+			);
+		});
+	};
+
+	instance.addHook("onDeclareRoute", duploseHandler);
+	instance.addHook("onDeclareAbstractRoute", (abstractRoute) => {
+		if(abstractRoute instanceof AbstractRoute){
+			duploseHandler(abstractRoute);
+		}
+	});
+	instance.addHook("onCreateProcess", duploseHandler);
+}

scripts/index.ts

@@ -33,3 +33,5 @@ import "./lib/accelerators/lazy";
 export * from "./lib/accelerator";
 export * from "./lib/error";
 export * from "./lib/parser";
+
+export {ZodAccelerator as default} from "./lib/accelerator";

scripts/lib/accelerator.ts

@@ -1,23 +1,14 @@
 import * as zod from "zod";
 import {ZodAcceleratorContent} from "./content";
 import {ZodAcceleratorParser} from "./parser";
-import {AbstractRoute, DuploConfig, DuploInstance, Process, Route} from "@duplojs/duplojs";
-import {duploExtends, duploInject} from "@duplojs/editor-tools";
 import {ZodAcceleratorError} from "./error";
-import packageJson from "../../package.json";
 
 declare module "zod" {
 	interface ZodType{
 		accelerator?: ZodAcceleratorParser<this>;
 	}
 }
 
-declare module "@duplojs/duplojs" {
-	interface Plugins {
-		"@duplojs/zod-accelerator": {version: string}
-	}
-}
-
 export abstract class ZodAccelerator{
 	protected static accelerators: ZodAccelerator[] = [];
 
@@ -77,66 +68,4 @@ export abstract class ZodAccelerator{
 	public static autoInstance(zodAccelerator: { new(...args: any[]): ZodAccelerator }){
 		ZodAccelerator.accelerators.push(new zodAccelerator());
 	}
-
-	public static duplojs(
-		instance: DuploInstance<DuploConfig>, 
-		params: Partial<
-			Record<
-				DuploConfig["environment"], 
-				boolean
-			>
-		> = {DEV: false, PROD: true}
-	){
-		const environment = instance.config.environment;
-
-		if(!params[environment]){
-			return;
-		}
-
-		instance.plugins["@duplojs/zod-accelerator"] = {version: packageJson.version};
-
-		const duploseHandler = (duplose: Route | Process | AbstractRoute) => {
-			if(Object.keys(duplose.extracted).length === 0){
-				return;
-			}
-
-			Object.entries(duplose.extracted).forEach(([key, value]) => {
-				if(!value){
-					return;
-				}
-
-				if(value instanceof zod.ZodType){
-					ZodAccelerator.build(value);
-				}
-				else {
-					Object.entries(value).forEach(([key, deepValue]) => {
-						ZodAccelerator.build(deepValue);
-					});
-				}
-			});
-
-			duploExtends(duplose, {
-				ZodAcceleratorError,
-			});
-
-			duploInject(duplose, ({}, d) => {
-				d.stringDuploseFunction = d.stringDuploseFunction.replace(
-					/\.parse\(request/g, 
-					".accelerator.parse(request"
-				);				
-				d.stringDuploseFunction = d.stringDuploseFunction.replace(
-					/error instanceof this\.ZodError/, 
-					"error instanceof this.extensions.ZodAcceleratorError"
-				);
-			});
-		};
-
-		instance.addHook("onDeclareRoute", duploseHandler);
-		instance.addHook("onDeclareAbstractRoute", (abstractRoute) => {
-			if(abstractRoute instanceof AbstractRoute){
-				duploseHandler(abstractRoute);
-			}
-		});
-		instance.addHook("onCreateProcess", duploseHandler);
-	}
 }

scripts/lib/content.ts

@@ -17,6 +17,7 @@ export class ZodAcceleratorContent{
 		"$this.": "this.{id}_",
 		"$id": "{id}",
 	};
+	private static inc = 0;
 
 	readonly id = ZodAcceleratorContent.generateId();
 	content: string[] = [];
@@ -107,6 +108,6 @@ export class ZodAcceleratorContent{
 	}
 
 	private static generateId(){
-		return `duploj$${process.hrtime.bigint()}`;
+		return `duploj$${(this.inc++)}`;
 	}
 }

test/E2E/route/route.ts

@@ -1,10 +1,10 @@
 import Duplo, {zod} from "@duplojs/duplojs";
 import {parentPort} from "worker_threads";
-import {ZodAccelerator} from "../../../scripts";
+import duploZodAccelerator from "../../../scripts/duplo";
 
 const duplo = Duplo({port: 1506, host: "localhost", environment: "DEV"});
 
-duplo.use(ZodAccelerator.duplojs, {DEV: true});
+duplo.use(duploZodAccelerator, {DEV: true});
 
 duplo.declareRoute("GET", "/test/1")
 .extract({
@@ -20,7 +20,7 @@ duplo.declareRoute("POST", "/test/2")
 .extract({
 	body: zod.object({
 		test1: zod.string()
-	})
+	}).passthrough()
 })
 .handler(({pickup}, res) => {
 	res.code(200).info("s").send(pickup("body"));