From feb5a2369d5115d949e9903f44d7bfc3b5f4cd0c Mon Sep 17 00:00:00 2001 From: joshuaboud Date: Wed, 29 May 2024 14:02:46 -0300 Subject: [PATCH] move regex snippets into RegexSnippets namespace --- houston-common-lib/lib/path.ts | 4 ++-- houston-common-lib/lib/syntax/ini-syntax.ts | 4 ++-- houston-common-lib/lib/syntax/key-value-syntax.ts | 4 ++-- houston-common-lib/lib/syntax/regex-snippets.ts | 5 ++++- houston-common-ui/lib/components/ParsedTextArea.vue | 4 ++-- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/houston-common-lib/lib/path.ts b/houston-common-lib/lib/path.ts index 775b22e..71de86f 100644 --- a/houston-common-lib/lib/path.ts +++ b/houston-common-lib/lib/path.ts @@ -5,7 +5,7 @@ import { ResultAsync, okAsync, errAsync, safeTry, ok, err } from "neverthrow"; import { User } from "@/user"; import { Group } from "@/group"; import { FilesystemMount, parseFileSystemType } from "@/filesystem"; -import { newlineSplitterRegex } from "@/syntax"; +import { RegexSnippets } from "@/syntax"; export class ModeOctet { r: boolean; @@ -239,7 +239,7 @@ export class Path { commandOptions ) ) - .map((proc) => proc.getStdout().trim().split(newlineSplitterRegex)[1]) + .map((proc) => proc.getStdout().trim().split(RegexSnippets.newlineSplitter)[1]) .andThen((tokens) => { const [source, mountpoint, realType] = tokens?.split(/\s+/g) ?? []; if ( diff --git a/houston-common-lib/lib/syntax/ini-syntax.ts b/houston-common-lib/lib/syntax/ini-syntax.ts index 44ddfec..7f2db5b 100644 --- a/houston-common-lib/lib/syntax/ini-syntax.ts +++ b/houston-common-lib/lib/syntax/ini-syntax.ts @@ -1,6 +1,6 @@ import { SyntaxParser } from "./syntax-parser"; import { Result, ok, err } from "neverthrow"; -import { newlineSplitterRegex } from "./regex-snippets"; +import { RegexSnippets } from "./regex-snippets"; import { KeyValueData, KeyValueSyntax } from "@/syntax/key-value-syntax"; import { ParsingError } from "@/errors"; @@ -55,7 +55,7 @@ export function IniSyntax( ? ({} as IniConfigData) : ({} as IniConfigData); let currentSection: string | null = null; - for (const [index, line] of text.split(newlineSplitterRegex).entries()) { + for (const [index, line] of text.split(RegexSnippets.newlineSplitter).entries()) { if (line.trim() === "" || commentRegex.test(line)) { continue; } diff --git a/houston-common-lib/lib/syntax/key-value-syntax.ts b/houston-common-lib/lib/syntax/key-value-syntax.ts index ab16ffd..6ea0864 100644 --- a/houston-common-lib/lib/syntax/key-value-syntax.ts +++ b/houston-common-lib/lib/syntax/key-value-syntax.ts @@ -1,7 +1,7 @@ import { SyntaxParser } from "@/syntax/syntax-parser"; import { ParsingError } from "@/errors"; import { Result, ok, err } from "neverthrow"; -import { newlineSplitterRegex } from "./regex-snippets"; +import { RegexSnippets } from "./regex-snippets"; export type KeyValueData< TValue extends string | [string, ...string[]] = string, @@ -53,7 +53,7 @@ export function KeyValueSyntax( Result.combine( text // split lines - .split(newlineSplitterRegex) + .split(RegexSnippets.newlineSplitter) .map( ( line, diff --git a/houston-common-lib/lib/syntax/regex-snippets.ts b/houston-common-lib/lib/syntax/regex-snippets.ts index cec853e..954eca4 100644 --- a/houston-common-lib/lib/syntax/regex-snippets.ts +++ b/houston-common-lib/lib/syntax/regex-snippets.ts @@ -1 +1,4 @@ -export const newlineSplitterRegex = /(? import { ref, watch, defineModel, defineProps, withDefaults } from "vue"; -import { type SyntaxParser, type SyntaxParserType, newlineSplitterRegex } from "@45drives/houston-common-lib"; +import { type SyntaxParser, type SyntaxParserType, RegexSnippets } from "@45drives/houston-common-lib"; import { reportError } from '@/components/NotificationView.vue'; const props = withDefaults(defineProps<{ @@ -35,7 +35,7 @@ watch(keyValueData, onKeyValueDataChanged, { immediate: true, deep: true });