Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions scripts/toDataParser/buildContext.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export interface BuildedContext {
readonly typescriptContext: TST.MapContext;
readonly importContext: TST.MapImportContext;
readonly importMode: ImportMode;
readonly keepIdentifier?: boolean;
}

export interface BuildContextParams {
Expand All @@ -25,6 +26,7 @@ export interface BuildContextParams {
readonly importContext?: TST.MapImportContext;
readonly importMode?: ImportMode;
readonly hooks?: readonly TransformerHook[];
readonly keepIdentifier?: boolean;
readonly toTypescript?: {
readonly mode?: TST.TransformerMode;
readonly hooks?: readonly TST.TransformerHook[];
Expand All @@ -48,6 +50,7 @@ export function buildContext(
const importContext: TST.MapImportContext = params.importContext ?? new Map();
const dependenciesContext: DependenciesContext = new Set();
const importMode = params.importMode ?? "lite";
const keepIdentifier = params.keepIdentifier ?? false;

importContext.set("@duplojs/utils/dataParser", {
namespace: ["DP"],
Expand All @@ -70,6 +73,7 @@ export function buildContext(
recursiveDataParsers: getRecursiveDataParser(schema),
dependencyIdentifier: factory.createIdentifier(importMode === "extended" ? "DPE" : "DP"),
dependenciesContext,
keepIdentifier,
},
);

Expand Down Expand Up @@ -106,5 +110,6 @@ export function buildContext(
importContext: importContext,
typescriptContext,
importMode,
keepIdentifier,
});
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,43 @@ import { type CallExpression, factory, type Identifier, type PropertyAssignment
import type * as TST from "@scripts/toTypescript";

export interface getDefinitionDataParserParams {
readonly dataParser: DP.DataParser;
readonly checkerTransformers: readonly ReturnType<typeof createCheckerTransformer>[];
readonly importContext: TST.MapImportContext;
readonly customProperties: readonly PropertyAssignment[];
readonly keepIdentifier: boolean;
}

export function getDefinitionDataParser(params: getDefinitionDataParserParams) {
export function getDefinitionDataParser(
dataParser: DP.DataParser,
params: getDefinitionDataParserParams,
) {
const propertyAssignments: PropertyAssignment[] = [];

if (params.dataParser.definition.errorMessage) {
if (dataParser.definition.errorMessage) {
propertyAssignments.push(
factory.createPropertyAssignment(
factory.createIdentifier("errorMessage"),
factory.createStringLiteral(params.dataParser.definition.errorMessage),
factory.createStringLiteral(dataParser.definition.errorMessage),
),
);
}

if (params.keepIdentifier && dataParser.definition.identifier) {
propertyAssignments.push(
factory.createPropertyAssignment(
factory.createIdentifier("identifier"),
factory.createStringLiteral(dataParser.definition.identifier),
),
);
}

if (A.minElements(params.customProperties, 1)) {
propertyAssignments.push(...params.customProperties);
}
if (A.minElements(params.dataParser.definition.checkers, 1)) {

if (A.minElements(dataParser.definition.checkers, 1)) {
const checkers = A.reduce(
params.dataParser.definition.checkers,
dataParser.definition.checkers,
A.reduceFrom<(CallExpression | Identifier)[]>([]),
({ element, lastValue, nextPush, exit }) => pipe(
checkerTransformer(
Expand All @@ -48,7 +62,7 @@ export function getDefinitionDataParser(params: getDefinitionDataParserParams) {

if (E.isLeft(checkers)) {
return E.left("buildDataParserGetDefinitionError", {
dataParser: params.dataParser,
dataParser,
error: checkers,
});
}
Expand Down
16 changes: 10 additions & 6 deletions scripts/toDataParser/dataParserTransformer/transformer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ export interface TransformerFunctionParams {
readonly dependencyIdentifier: Identifier;
readonly hooks: readonly TransformerHook[];
readonly recursiveDataParsers: DP.DataParser[];
readonly keepIdentifier: boolean;
readonly toTypescript?: {
readonly mode?: TST.TransformerMode;
readonly hooks?: readonly TST.TransformerHook[];
Expand Down Expand Up @@ -113,12 +114,15 @@ export function transformer(
},
importContext: params.importContext,
getDefinition(customProperties = []) {
return getDefinitionDataParser({
dataParser: currentDataParser,
checkerTransformers: params.checkerTransformers,
importContext: params.importContext,
customProperties,
});
return getDefinitionDataParser(
currentDataParser,
{
checkerTransformers: params.checkerTransformers,
importContext: params.importContext,
keepIdentifier: params.keepIdentifier,
customProperties,
},
);
},
addImport: TST.createAddImport(params.importContext),
};
Expand Down
32 changes: 32 additions & 0 deletions scripts/toDataParser/getOverrideDeclaration.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
import { factory, SyntaxKind } from "typescript";

export function getOverrideDeclaration() {
return [
factory.createImportDeclaration(
undefined,
undefined,
factory.createStringLiteral("@duplojs/utils/dataParser"),
undefined,
),
factory.createModuleDeclaration(
[factory.createToken(SyntaxKind.DeclareKeyword)],
factory.createStringLiteral("@duplojs/utils/dataParser"),
factory.createModuleBlock([
factory.createInterfaceDeclaration(
undefined,
factory.createIdentifier("DataParserDefinition"),
undefined,
undefined,
[
factory.createPropertySignature(
undefined,
factory.createIdentifier("identifier"),
factory.createToken(SyntaxKind.QuestionToken),
factory.createKeywordTypeNode(SyntaxKind.StringKeyword),
),
],
),
]),
),
];
}
1 change: 1 addition & 0 deletions scripts/toDataParser/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ export * from "./dataParserTransformer";
export * from "./render";
export * from "./buildContext";
export * from "./printer";
export * from "./getOverrideDeclaration";
6 changes: 6 additions & 0 deletions scripts/toDataParser/printer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { createPrinter, createSourceFile, EmitHint, factory, NodeFlags, ScriptKi
import { type BuildedContext } from "./buildContext";
import { A, G, pipe, S } from "@duplojs/utils";
import * as TST from "@scripts/toTypescript";
import { getOverrideDeclaration } from "./getOverrideDeclaration";

export function printer(params: BuildedContext) {
const sourceFile = createSourceFile("print.ts", "", ScriptTarget.Latest, false, ScriptKind.TS);
Expand Down Expand Up @@ -43,6 +44,11 @@ export function printer(params: BuildedContext) {
return pipe(
[
...TST.createImportDeclaration(params.importContext),
...(
params.keepIdentifier
? getOverrideDeclaration()
: []
),
...params.typescriptContext.values(),
...dataParserStatements,
],
Expand Down
14 changes: 14 additions & 0 deletions tests/toDataParser/__snapshots__/render.test.ts.snap
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html

exports[`render > keep identifier 1`] = `
"import * as DP from "@duplojs/utils/dataParser";

import "@duplojs/utils/dataParser";

declare module "@duplojs/utils/dataParser" {
interface DataParserDefinition {
identifier?: string;
}
}

export const testKeepIdentifierDataParser = DP.number({ identifier: "testKeepIdentifier" });"
`;

exports[`render > renders anonymous recursive dataParser in extended mode 1`] = `
"import * as DP from "@duplojs/utils/dataParser";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,16 +86,19 @@ describe("default dataParser transformers definition error", () => {
});

expect(
getDefinitionDataParser({
getDefinitionDataParser(
dataParser,
checkerTransformers: [
(checker, { buildError }) => DP.checkerStringMinKind.has(checker)
? buildError()
: E.left("checkerNotSupport", checker),
],
importContext: new Map(),
customProperties: [],
}),
{
checkerTransformers: [
(checker, { buildError }) => DP.checkerStringMinKind.has(checker)
? buildError()
: E.left("checkerNotSupport", checker),
],
importContext: new Map(),
customProperties: [],
keepIdentifier: true,
},
),
).toStrictEqual(
E.left("buildDataParserGetDefinitionError", {
dataParser,
Expand Down
15 changes: 15 additions & 0 deletions tests/toDataParser/render.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -413,4 +413,19 @@ describe("render", () => {
expect(replaceHook).toHaveBeenCalledTimes(1);
expect(result).toContain("DP.string()");
});

it("keep identifier", () => {
const result = render(
DPE.number().setIdentifier("testKeepIdentifier"),
{
identifier: "testKeepIdentifier",
dataParserTransformers: defaultTransformers,
checkerTransformers: defaultCheckerTransformers,
typescriptTransformers: tsDefaultTransformers,
keepIdentifier: true,
},
);

expect(result).toMatchSnapshot();
});
});
Loading