Skip to content
Draft
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
3 changes: 3 additions & 0 deletions src/core/core-definitions.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { TServiceType } from "../services/service-definitions";
import { TMatcherType } from "../matchers/matcher-definitions";
import { TMiddlewareType } from "../middleware/middleware-definitions";

export type TSet = Map<string, string | null>;

Expand All @@ -12,6 +13,7 @@ export interface CoreArgs {
serviceConfig: string | null;
matcher: TMatcherType;
prompt: string;
middleware: TMiddlewareType[]
}

export interface TChangeSet {
Expand Down Expand Up @@ -42,4 +44,5 @@ export interface CliArgs extends Record<string, string | undefined> {
service: string;
serviceConfig?: string;
matcher: string;
middleware?: string
}
6 changes: 5 additions & 1 deletion src/core/invoke-translation-service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ import {
TServiceArgs,
TString,
} from "../services/service-definitions";
import {
instantiateTMiddleware
} from "../middleware/middleware-definitions";

export async function invokeTranslationService(
serviceInputs: TSet,
Expand Down Expand Up @@ -84,7 +87,8 @@ async function runTranslationService(
`Invoke '${args.service}' from '${args.srcLng}' to '${args.targetLng}' with ${serviceArgs.strings.length} inputs...`
);
const translationService = await instantiateTService(args.service);
const rawResults = await translationService.translateStrings(serviceArgs);
const translationMiddleware = await instantiateTMiddleware(args.middleware, translationService)
const rawResults = await translationMiddleware.processTranslation(serviceArgs);
return rawResults.map((rawResult) => {
const cleanResult = reInsertInterpolations(
rawResult.translated,
Expand Down
4 changes: 4 additions & 0 deletions src/core/translate-cli.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
} from "../file-formats/file-format-definitions";
import { getTServiceList, TServiceType } from "../services/service-definitions";
import { getTMatcherList, TMatcherType } from "../matchers/matcher-definitions";
import { TMiddlewareType } from "../middleware/middleware-definitions";

async function resolveOldTarget(
args: CliArgs,
Expand Down Expand Up @@ -98,6 +99,9 @@ export async function translateCli(cliArgs: CliArgs) {
serviceConfig: cliArgs.serviceConfig ?? null,
matcher: cliArgs.matcher as TMatcherType,
prompt: cliArgs.prompt ?? "",
middleware: (cliArgs.middleware ?? "")
.split(",")
.filter((s) => s) as TMiddlewareType[]
};
const result = await translateCore(coreArgs);

Expand Down
10 changes: 10 additions & 0 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { getTFileFormatList } from "./file-formats/file-format-definitions";
import { getTMatcherList } from "./matchers/matcher-definitions";
import { getTServiceList } from "./services/service-definitions";
import { extractVersion } from "./util/extract-version";
import { getTMiddlewareList } from "./middleware/middleware-definitions";

process.on("unhandledRejection", (error) => {
console.error("[fatal]", error);
Expand All @@ -15,6 +16,10 @@ function formatOneOfOptions(options: string[]): string {
return `One of ${formatCliOptions(options)}`;
}

function formatManyOfOptions(options: string[]): string {
return `Comma-separated list of ${formatCliOptions(options)}`
}

export function run(process: NodeJS.Process, cliBinDir: string): void {
commander.storeOptionsAsProperties(false);
commander.addHelpCommand(false);
Expand Down Expand Up @@ -60,6 +65,10 @@ export function run(process: NodeJS.Process, cliBinDir: string): void {
"--prompt <prompt>",
"supply a prompt for the AI translation service"
)
.option(
"--middleware <middleware>",
formatManyOfOptions(getTMiddlewareList())
)
.version(extractVersion({ cliBinDir }), "-v, --version")
.parse(process.argv);

Expand All @@ -79,6 +88,7 @@ export function run(process: NodeJS.Process, cliBinDir: string): void {
serviceConfig: commander.opts().serviceConfig,
matcher: commander.opts().matcher,
prompt: commander.opts().prompt,
middleware: commander.opts().middleware,
};
translateCli(args)
.then(() => {
Expand Down
38 changes: 38 additions & 0 deletions src/middleware/middleware-definitions.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
import { TServiceArgs, TResult, TService } from '../services/service-definitions'

export interface TMiddleware {
next?: TMiddleware
processTranslation(args: TServiceArgs): Promise<TResult[]>
}

const middlewareMap = {
'sanitize-key': null,
};

export type TMiddlewareType = keyof typeof middlewareMap;

export function getTMiddlewareList(): TMiddlewareType[] {
return Object.keys(middlewareMap) as TMiddlewareType[];
}

export async function instantiateTMiddleware(
middlewares: TMiddlewareType[],
service: TService,
): Promise<TMiddleware> {
let next: TMiddleware = {
processTranslation(args) {
return service.translateStrings(args)
},
}

while(middlewares.length > 0) {
let middlewareType = middlewares.pop()!
switch(middlewareType) {
case "sanitize-key":
next = new (await import("./sanitize-key")).SanitizeKey(next)
break;
}
}

return next
}
37 changes: 37 additions & 0 deletions src/middleware/sanitize-key.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
import { TServiceArgs, TResult } from "../services/service-definitions";
import { TMiddleware } from "./middleware-definitions";

interface SKey {
new: string
old: string
}

export class SanitizeKey implements TMiddleware {
next: TMiddleware
_sanitizedKeys: SKey[] = []

constructor(next: TMiddleware) {
this.next = next
}

async processTranslation(args: TServiceArgs): Promise<TResult[]> {
this._sanitizedKeys = args.strings.map(({key}) => {
return {
new: key.replace(/[^a-zA-Z0-9_]+/g, '_'),
old: key,
}
})

for (let i = 0; i < this._sanitizedKeys.length; i++) {
args.strings[i].key = this._sanitizedKeys[i].new
}

const res = await this.next.processTranslation(args)

for (let i = 0; i < this._sanitizedKeys.length; i++) {
res[i].key = this._sanitizedKeys[i].old
}

return res
}
}
1 change: 1 addition & 0 deletions test/core/core-test-util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ export const commonArgs: Omit<CoreArgs, "oldTarget" | "src"> = {
srcLng: "en",
targetLng: "de",
prompt: "",
middleware: [],
};

export async function translateCoreAssert(
Expand Down
Loading