diff --git a/integration/codeGenerator/__snapshots__/index.test.ts.snap b/integration/codeGenerator/__snapshots__/index.test.ts.snap index 7e2c4bd..79db2b0 100644 --- a/integration/codeGenerator/__snapshots__/index.test.ts.snap +++ b/integration/codeGenerator/__snapshots__/index.test.ts.snap @@ -239,7 +239,7 @@ import { userNameDataParser } from "./userNameDataParser"; import { $userDataParser } from "./types"; -export const userDataParser: DP.DataParser<$userDataParser> = DP.object({ +export const userDataParser: DP.DataParser<$userDataParser, unknown> = DP.object({ id: userIdDataParser, name: userNameDataParser, age: DP.number(), diff --git a/package-lock.json b/package-lock.json index 92a985e..4b5c61f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -41,7 +41,7 @@ "node": ">=22.15.1" }, "peerDependencies": { - "@duplojs/data-parser-tools": ">=0.5.4 <1.0.0", + "@duplojs/data-parser-tools": ">=0.5.5 <1.0.0", "@duplojs/server-utils": ">=0.4.1 <1.0.0", "@duplojs/utils": ">=1.9.2 <2.0.0" } @@ -1090,9 +1090,9 @@ "license": "MIT" }, "node_modules/@duplojs/data-parser-tools": { - "version": "0.5.4", - "resolved": "https://registry.npmjs.org/@duplojs/data-parser-tools/-/data-parser-tools-0.5.4.tgz", - "integrity": "sha512-+OAwK1jqHV1Djs3MbkPSEVL9GTr10KNQSQoBWFlhr39CnNZGrmZ899GNQgMKClJzKdHY9SPgqAMYYaBLVya72Q==", + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/@duplojs/data-parser-tools/-/data-parser-tools-0.5.5.tgz", + "integrity": "sha512-2zVjLNsqvF+aMnV31Tr/xfnwWdMYkSCxxDXoxPczJQPgWACkkHeuiuyLSTgrTNVjj3lLVGve2Hm6UKA0pquFYg==", "license": "MIT", "peer": true, "workspaces": [ diff --git a/package.json b/package.json index fe207cb..e57b0a5 100644 --- a/package.json +++ b/package.json @@ -88,7 +88,7 @@ "README.md" ], "peerDependencies": { - "@duplojs/data-parser-tools": ">=0.5.4 <1.0.0", + "@duplojs/data-parser-tools": ">=0.5.5 <1.0.0", "@duplojs/server-utils": ">=0.4.1 <1.0.0", "@duplojs/utils": ">=1.9.2 <2.0.0" }, diff --git a/scripts/plugins/codeGenerator/typescriptTransformer.ts b/scripts/plugins/codeGenerator/typescriptTransformer.ts index 6d1bfbc..7d653b5 100644 --- a/scripts/plugins/codeGenerator/typescriptTransformer.ts +++ b/scripts/plugins/codeGenerator/typescriptTransformer.ts @@ -1,12 +1,11 @@ -import { DataParserToTypescript } from "@duplojs/data-parser-tools"; -import { createTransformer } from "@duplojs/data-parser-tools/toTypescript"; +import { createTransformer, defaultTransformers } from "@duplojs/data-parser-tools/toTypescript"; +import { Typescript } from "@duplojs/data-parser-tools/typescript"; import { SDP } from "@duplojs/server-utils"; import { DP } from "@duplojs/utils"; -import { factory } from "typescript"; export const fileTransformer = createTransformer( SDP.fileKind.has, - (__, { success }) => success(factory.createTypeReferenceNode("File")), + (__, { success }) => success(Typescript.factory.createTypeReferenceNode("File")), ); export const dateTransformer = createTransformer( @@ -15,12 +14,12 @@ export const dateTransformer = createTransformer( addImport("@duplojs/utils/date", "TheDate"); addImport("@duplojs/utils/date", "SerializedTheDate"); - return success(factory.createUnionTypeNode([ - factory.createTypeReferenceNode( - factory.createIdentifier("SerializedTheDate"), + return success(Typescript.factory.createUnionTypeNode([ + Typescript.factory.createTypeReferenceNode( + Typescript.factory.createIdentifier("SerializedTheDate"), ), - factory.createTypeReferenceNode( - factory.createIdentifier("TheDate"), + Typescript.factory.createTypeReferenceNode( + Typescript.factory.createIdentifier("TheDate"), ), ])); }, @@ -32,12 +31,12 @@ export const timeTransformer = createTransformer( addImport("@duplojs/utils/date", "TheTime"); addImport("@duplojs/utils/date", "SerializedTheTime"); - return success(factory.createUnionTypeNode([ - factory.createTypeReferenceNode( - factory.createIdentifier("SerializedTheTime"), + return success(Typescript.factory.createUnionTypeNode([ + Typescript.factory.createTypeReferenceNode( + Typescript.factory.createIdentifier("SerializedTheTime"), ), - factory.createTypeReferenceNode( - factory.createIdentifier("TheTime"), + Typescript.factory.createTypeReferenceNode( + Typescript.factory.createIdentifier("TheTime"), ), ])); }, @@ -47,5 +46,5 @@ export const typescriptTransformers = [ fileTransformer, dateTransformer, timeTransformer, - ...DataParserToTypescript.defaultTransformers, + ...defaultTransformers, ];