♻️ Extract getConfig into the core package

AckeeCZ · Mar 27, 2022 · 1d14110 · 1d14110
1 parent ed9be46
commit 1d14110
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 14 deletions.
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -11,7 +11,6 @@
   },
   "bugs": "https://github.com/AckeeCZ/lokse/issues",
   "dependencies": {
-    "@endemolshinegroup/cosmiconfig-typescript-loader": "^3.0.2",
     "@lokse/core": "^2.1.4",
     "@oclif/command": "^1",
     "@oclif/config": "^1",
@@ -22,8 +21,6 @@
     "@types/dedent": "^0.7.0",
     "@types/update-notifier": "^5.0.0",
     "array.prototype.flat": "^1.2.4",
-    "cosmiconfig": "^7.0.0",
-    "cosmiconfig-ts-loader": "^0.1.1",
     "dedent": "^0.7.0",
     "dotenv-flow": "^3.2.0",
     "open": "^7.2.1",

diff --git a/packages/cli/src/base.ts b/packages/cli/src/base.ts
@@ -1,7 +1,8 @@
 import { Command } from "@oclif/command";
 import * as updateNotifier from "update-notifier";
 
-import { get as getConfig, ConfigType } from "./config";
+import { getConfig } from "@lokse/core";
+import type { ConfigType } from "@lokse/core";
 
 const pkg = require("../package.json");
 

diff --git a/packages/cli/src/commands/open.ts b/packages/cli/src/commands/open.ts
@@ -1,7 +1,7 @@
 import { flags } from "@oclif/command";
 import * as open from "open";
 
-import { NAME } from "../constants";
+import { NAME } from "@lokse/core";
 import Base from "../base";
 import * as cliFlags from "../flags";
 

diff --git a/packages/cli/src/commands/update.ts b/packages/cli/src/commands/update.ts
@@ -15,10 +15,10 @@ import {
   Line,
   FatalError,
   loadPlugins,
+  NAME,
 } from "@lokse/core";
 import type { WorksheetLinesByTitle } from "@lokse/core";
 
-import { NAME } from "../constants";
 import logger from "../logger";
 import Base from "../base";
 

diff --git a/packages/cli/src/constants.ts b/packages/cli/src/constants.ts
diff --git a/packages/cli/src/flags/id.ts b/packages/cli/src/flags/id.ts
@@ -1,13 +1,13 @@
 import { flags } from "@oclif/command";
+import { getConfig } from "@lokse/core";
 import { MissingFlagValue } from "./errors";
-import * as config from "../config";
 
 export const flag = flags.build({
   char: "i",
   description: "spreadsheet id",
 
   default: ({ flags }) => {
-    const conf = config.get();
+    const conf = getConfig();
     const id = process.env.SPREADSHEET_ID ?? flags.id ?? conf?.sheetId;
 
     return id;

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -13,6 +13,8 @@
     "@types/google-spreadsheet": "^3.0.1",
     "@types/mkdirp": "^1.0.1",
     "bluebird": "^3.7.2",
+    "cosmiconfig": "^7.0.0",
+    "cosmiconfig-ts-loader": "^0.1.1",
     "dedent": "^0.7.0",
     "google-spreadsheet": "^3.2.0",
     "lodash": "^4.17.20",

diff --git a/packages/cli/src/config.ts → packages/core/src/config.ts b/packages/cli/src/config.ts → packages/core/src/config.ts
@@ -1,9 +1,9 @@
 import { cosmiconfigSync } from "cosmiconfig";
 import typeScriptLoader from "cosmiconfig-ts-loader";
-import { OutputFormat } from "@lokse/core";
-import type { PluginName, PluginDefinition, SheetsFilter } from "@lokse/core";
 
-import { NAME } from "./constants";
+import { OutputFormat, NAME } from "./constants";
+import type { PluginDefinition, PluginName } from "./plugins";
+import type { SheetsFilter } from "./reader";
 
 // TODO: use async API once custom oclif flags will be asynchronous
 const explorerSync = cosmiconfigSync(NAME, {
@@ -41,7 +41,7 @@ export type ConfigType = {
   plugins?: (PluginName | PluginDefinition)[];
 };
 
-export function get(): undefined | null | ConfigType {
+export function getConfig(): undefined | null | ConfigType {
   const result = explorerSync.search();
   return result?.config;
 }
diff --git a/packages/core/src/constants.ts b/packages/core/src/constants.ts
@@ -1,3 +1,5 @@
+export const NAME = "lokse";
+
 export enum OutputFormat {
   JSON = "json",
   ANDROID = "android",

diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
@@ -9,10 +9,12 @@ export { transformersByFormat } from "./transformer";
 export { default as FileWriter } from "./writer";
 export { default as Line } from "./line";
 
-export { OutputFormat } from "./constants";
+export { OutputFormat, NAME } from "./constants";
 
 export { FatalError } from "./errors";
 
+export * from "./config";
+
 export * from "./plugins";
 
 export * from "./utils";