Skip to content

Commit

Permalink
fix: look for getTranslate instead of useTranslate (#51)
Browse files Browse the repository at this point in the history
  • Loading branch information
cyyynthia authored Aug 2, 2023
1 parent 04f00f5 commit adb5f95
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 53 deletions.
34 changes: 17 additions & 17 deletions src/extractor/machines/svelte.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ type MachineCtx = {
line: number;

key: KeyWithDynamicNs;
useTranslate: string | null | false;
getTranslate: string | null | false;
ignore: null | { type: 'key' | 'ignore'; line: number };

keys: ExtractedKey[];
Expand All @@ -32,7 +32,7 @@ export default createMachine<MachineCtx>(
line: 0,

key: VOID_KEY,
useTranslate: null,
getTranslate: null,
ignore: null,

keys: [],
Expand Down Expand Up @@ -98,15 +98,15 @@ export default createMachine<MachineCtx>(
},
},
},
useTranslate: {
getTranslate: {
initial: 'idle',
states: {
idle: {
on: {
'entity.name.function.ts': {
target: 'func',
actions: 'storeLine',
cond: (_ctx, evt) => evt.token === 'useTranslate',
cond: (_ctx, evt) => evt.token === 'getTranslate',
},
},
},
Expand Down Expand Up @@ -138,20 +138,20 @@ export default createMachine<MachineCtx>(
'punctuation.definition.string.template.begin.ts': 'namespace',
'variable.other.readwrite.ts': {
target: 'idle',
actions: ['storeUseTranslate', 'markUseTranslateAsDynamic'],
actions: ['storeGetTranslate', 'markGetTranslateAsDynamic'],
},
'meta.brace.round.ts': {
target: 'idle',
cond: (_ctx, evt) => evt.token === ')',
actions: 'storeUseTranslate',
actions: 'storeGetTranslate',
},
},
},
namespace: {
on: {
'*': {
target: 'namespace_end',
actions: 'storeNamespacedUseTranslate',
actions: 'storeNamespacedGetTranslate',
},
},
},
Expand All @@ -161,11 +161,11 @@ export default createMachine<MachineCtx>(
'meta.brace.round.ts': 'idle',
'punctuation.definition.template-expression.begin.ts': {
target: 'idle',
actions: 'markUseTranslateAsDynamic',
actions: 'markGetTranslateAsDynamic',
},
'keyword.operator.arithmetic.ts': {
target: 'idle',
actions: 'markUseTranslateAsDynamic',
actions: 'markGetTranslateAsDynamic',
},
},
},
Expand Down Expand Up @@ -242,7 +242,7 @@ export default createMachine<MachineCtx>(
'punctuation.definition.variable.svelte': {
target: 'dollar',
cond: (ctx, evt) =>
ctx.useTranslate !== null && evt.token === '$',
ctx.getTranslate !== null && evt.token === '$',
},
},
},
Expand Down Expand Up @@ -410,14 +410,14 @@ export default createMachine<MachineCtx>(
],
}),

storeUseTranslate: assign({
useTranslate: (_ctx, _evt) => '',
storeGetTranslate: assign({
getTranslate: (_ctx, _evt) => '',
}),
storeNamespacedUseTranslate: assign({
useTranslate: (_ctx, evt) => evt.token,
storeNamespacedGetTranslate: assign({
getTranslate: (_ctx, evt) => evt.token,
}),
markUseTranslateAsDynamic: assign({
useTranslate: (_ctx, _evt) => false,
markGetTranslateAsDynamic: assign({
getTranslate: (_ctx, _evt) => false,
warnings: (ctx, _evt) => [
...ctx.warnings,
{ warning: 'W_DYNAMIC_NAMESPACE', line: ctx.line },
Expand Down Expand Up @@ -463,7 +463,7 @@ export default createMachine<MachineCtx>(
storeKeyCurrentNamespace: assign({
key: (ctx, _evt) => ({
...ctx.key,
namespace: ctx.useTranslate !== null ? ctx.useTranslate : undefined,
namespace: ctx.getTranslate !== null ? ctx.getTranslate : undefined,
}),
}),

Expand Down
Loading

0 comments on commit adb5f95

Please sign in to comment.