From 676f8ea6c3f185e4b82aef7033d1d1bcaebdf868 Mon Sep 17 00:00:00 2001
From: Dominik Prokop <dominik.prokop@grafana.com>
Date: Mon, 16 Sep 2019 18:15:59 +0200
Subject: [PATCH] Organise text utils

---
 packages/grafana-data/src/index.ts                             | 1 +
 packages/grafana-data/src/text/index.ts                        | 3 +++
 packages/grafana-data/src/{utils => text}/markdown.test.ts     | 0
 packages/grafana-data/src/{utils => text}/markdown.ts          | 0
 packages/grafana-data/src/{utils => text}/string.test.ts       | 0
 packages/grafana-data/src/{utils => text}/string.ts            | 0
 packages/grafana-data/src/{utils => text}/text.test.ts         | 0
 packages/grafana-data/src/{utils => text}/text.ts              | 0
 .../grafana-data/src/transformations/matchers/nameMatcher.ts   | 2 +-
 packages/grafana-data/src/utils/index.ts                       | 3 ---
 10 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100644 packages/grafana-data/src/text/index.ts
 rename packages/grafana-data/src/{utils => text}/markdown.test.ts (100%)
 rename packages/grafana-data/src/{utils => text}/markdown.ts (100%)
 rename packages/grafana-data/src/{utils => text}/string.test.ts (100%)
 rename packages/grafana-data/src/{utils => text}/string.ts (100%)
 rename packages/grafana-data/src/{utils => text}/text.test.ts (100%)
 rename packages/grafana-data/src/{utils => text}/text.ts (100%)

diff --git a/packages/grafana-data/src/index.ts b/packages/grafana-data/src/index.ts
index eca6140807b..c5f3add1d5b 100644
--- a/packages/grafana-data/src/index.ts
+++ b/packages/grafana-data/src/index.ts
@@ -4,3 +4,4 @@ export * from './vector';
 export * from './dataframe';
 export * from './transformations';
 export * from './datetime';
+export * from './text';
diff --git a/packages/grafana-data/src/text/index.ts b/packages/grafana-data/src/text/index.ts
new file mode 100644
index 00000000000..b59a1d992d5
--- /dev/null
+++ b/packages/grafana-data/src/text/index.ts
@@ -0,0 +1,3 @@
+export * from './string';
+export * from './markdown';
+export * from './text';
diff --git a/packages/grafana-data/src/utils/markdown.test.ts b/packages/grafana-data/src/text/markdown.test.ts
similarity index 100%
rename from packages/grafana-data/src/utils/markdown.test.ts
rename to packages/grafana-data/src/text/markdown.test.ts
diff --git a/packages/grafana-data/src/utils/markdown.ts b/packages/grafana-data/src/text/markdown.ts
similarity index 100%
rename from packages/grafana-data/src/utils/markdown.ts
rename to packages/grafana-data/src/text/markdown.ts
diff --git a/packages/grafana-data/src/utils/string.test.ts b/packages/grafana-data/src/text/string.test.ts
similarity index 100%
rename from packages/grafana-data/src/utils/string.test.ts
rename to packages/grafana-data/src/text/string.test.ts
diff --git a/packages/grafana-data/src/utils/string.ts b/packages/grafana-data/src/text/string.ts
similarity index 100%
rename from packages/grafana-data/src/utils/string.ts
rename to packages/grafana-data/src/text/string.ts
diff --git a/packages/grafana-data/src/utils/text.test.ts b/packages/grafana-data/src/text/text.test.ts
similarity index 100%
rename from packages/grafana-data/src/utils/text.test.ts
rename to packages/grafana-data/src/text/text.test.ts
diff --git a/packages/grafana-data/src/utils/text.ts b/packages/grafana-data/src/text/text.ts
similarity index 100%
rename from packages/grafana-data/src/utils/text.ts
rename to packages/grafana-data/src/text/text.ts
diff --git a/packages/grafana-data/src/transformations/matchers/nameMatcher.ts b/packages/grafana-data/src/transformations/matchers/nameMatcher.ts
index a951e221d39..1061c2d8047 100644
--- a/packages/grafana-data/src/transformations/matchers/nameMatcher.ts
+++ b/packages/grafana-data/src/transformations/matchers/nameMatcher.ts
@@ -1,7 +1,7 @@
 import { Field, DataFrame } from '../../types/dataFrame';
 import { FieldMatcherID, FrameMatcherID } from './ids';
 import { FieldMatcherInfo, FrameMatcherInfo } from '../../types/transformations';
-import { stringToJsRegex } from '../../utils/string';
+import { stringToJsRegex } from '../../text/string';
 
 // General Field matcher
 const fieldNameMacher: FieldMatcherInfo<string> = {
diff --git a/packages/grafana-data/src/utils/index.ts b/packages/grafana-data/src/utils/index.ts
index cd0f3b8849d..e83cc5d3957 100644
--- a/packages/grafana-data/src/utils/index.ts
+++ b/packages/grafana-data/src/utils/index.ts
@@ -1,6 +1,4 @@
-export * from './string';
 export * from './registry';
-export * from './markdown';
 export * from './deprecationWarning';
 export * from './csv';
 export * from './fieldReducer';
@@ -9,6 +7,5 @@ export * from './labels';
 export * from './labels';
 export * from './object';
 export * from './thresholds';
-export * from './text';
 
 export { getMappedValue } from './valueMappings';