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
10 changes: 10 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"google-auth-library": "^10.7.0",
"google-spreadsheet": "^5.3.0",
"hebrew-transliteration": "^2.11.0",
"serialize-javascript": "^7.0.7",
"svelte-codemirror-editor": "^2.1.0",
"tailwindcss": "^4.3.1",
"typescript": "^6.0.3"
Expand Down
3 changes: 3 additions & 0 deletions src/components/transliterate/FeatureEditor.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,9 @@
".cm-completionDetail": {
color: "var(--muted-foreground)",
},
".ͼg": {
color: "#7878f7",
},
}),
];
</script>
Expand Down
53 changes: 8 additions & 45 deletions src/components/transliterate/SettingsDialog.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
import { EditorView } from "@codemirror/view";
import IconInfoCircle from "@tabler/icons-svelte/icons/info-circle";
import type { SBL } from "hebrew-transliteration";
import { version } from "hebrew-transliteration/package.json";
import serialize from "serialize-javascript";
import { getContext } from "svelte";
import CodeMirror from "svelte-codemirror-editor";
import { toast } from "svelte-sonner";
Expand Down Expand Up @@ -219,16 +221,6 @@
return String(val);
}

function serialize_value(key: string, value: unknown): unknown {
if (value instanceof RegExp) {
return `new RegExp(${JSON.stringify(value.source)}, ${JSON.stringify(value.flags)})`;
}
if (typeof value === "function") {
return `(${value.toString()})`;
}
return value;
}

function is_modified(): boolean {
return !!transliteration_state.value.modified_schema_base;
}
Expand Down Expand Up @@ -385,9 +377,8 @@
return;
}
const schemaObj = eval(`(${match[1]})`) as SBL;
const reconstructed_schema = reconstruct_special_values(schemaObj) as SBL;
transliteration_state.value.schema = {
...reconstructed_schema,
...schemaObj,
};
transliteration_state.value.modified_schema_base = "";
} catch (err) {
Expand All @@ -397,38 +388,6 @@
reader.readAsText(file);
}

function reconstruct_special_values(obj: unknown): unknown {
if (Array.isArray(obj)) {
return obj.map(reconstruct_special_values);
}
if (obj && typeof obj === "object") {
const result: Record<string, unknown> = {};
for (const [key, value] of Object.entries(obj)) {
if (typeof value === "string") {
if (/^new RegExp\(/.test(value)) {
try {
result[key] = eval(value);
} catch {
result[key] = value;
}
} else if (/^\(.*\) =>/.test(value) || /^function\(/.test(value)) {
try {
result[key] = eval(value);
} catch {
result[key] = value;
}
} else {
result[key] = value;
}
} else {
result[key] = reconstruct_special_values(value);
}
}
return result;
}
return obj;
}

function clear_custom_schema() {
custom_schema_filename = "";
custom_upload_visibility = "hidden";
Expand All @@ -441,7 +400,11 @@
}

function export_schema() {
const schemaContent = `export const schema = ${JSON.stringify(transliteration_state.value.schema, serialize_value, 2)};`;
const schemaContent =
`// hebrew-transliteration v${version}\n// ${new Intl.DateTimeFormat(
navigator.language,
).format(new Date())}\n` +
`export const schema = ${serialize(transliteration_state.value.schema, { space: 2 })};`.trim();
const blob = new Blob([schemaContent], { type: "text/javascript" });
const url = URL.createObjectURL(blob);
const a = document.createElement("a");
Expand Down