@dsmrt/axiom-config 0.1.1 → 0.2.1

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @dsmrt/axiom-config
 
+## 0.2.1
+
+### Patch Changes
+
+- 90d88c8: fix load config return with custom interfaces
+
+## 0.2.0
+
+### Minor Changes
+
+- 7aa81f2: fixing issues with publishing the package with changesets
+
 ## 0.1.1
 
 ### Patch Changes

package/dist/index.d.mts

@@ -15,12 +15,12 @@ interface ConfigMethods {
     isProd(): boolean;
     asParameterPath(name: string): string;
 }
-declare class ConfigContainer<T = object> implements BaseConfig, ConfigMethods {
+declare class ConfigContainer implements BaseConfig, ConfigMethods {
     readonly name: string;
     readonly env: string;
     readonly aws: AwsConfigs;
     readonly prodEnvName?: string;
-    constructor(config: T & BaseConfig);
+    constructor(config: BaseConfig);
     isProd(): boolean;
     asParameterPath(name: string): string;
 }
@@ -39,7 +39,7 @@ interface LoadConfigInput {
     cwd?: string;
 }
 declare const importConfigFromPath: (path: string) => Config;
-declare const loadConfig: <T extends object>(input?: LoadConfigInput) => ConfigContainer<T>;
+declare const loadConfig: <T extends object>(input?: LoadConfigInput) => ConfigContainer & T;
 /**
  * Simple object check.
  */

package/dist/index.d.ts

@@ -15,12 +15,12 @@ interface ConfigMethods {
     isProd(): boolean;
     asParameterPath(name: string): string;
 }
-declare class ConfigContainer<T = object> implements BaseConfig, ConfigMethods {
+declare class ConfigContainer implements BaseConfig, ConfigMethods {
     readonly name: string;
     readonly env: string;
     readonly aws: AwsConfigs;
     readonly prodEnvName?: string;
-    constructor(config: T & BaseConfig);
+    constructor(config: BaseConfig);
     isProd(): boolean;
     asParameterPath(name: string): string;
 }
@@ -39,7 +39,7 @@ interface LoadConfigInput {
     cwd?: string;
 }
 declare const importConfigFromPath: (path: string) => Config;
-declare const loadConfig: <T extends object>(input?: LoadConfigInput) => ConfigContainer<T>;
+declare const loadConfig: <T extends object>(input?: LoadConfigInput) => ConfigContainer & T;
 /**
  * Simple object check.
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dsmrt/axiom-config",
-  "version": "0.1.1",
+  "version": "0.2.1",
   "description": "Config library for axiom cli",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -29,13 +29,13 @@
     "@types/yargs": "^17.0.31",
     "@typescript-eslint/eslint-plugin": "^6.12.0",
     "@typescript-eslint/parser": "^6.12.0",
-    "@vitest/coverage-v8": "^0.34.6",
     "eslint": "^8.54.0",
     "prettier": "^3.1.0",
     "ts-node": "^10.9.1",
     "tsup": "^8.0.1",
     "typescript": "^5.2.2",
-    "vitest": "^0.34.6"
+    "@vitest/coverage-v8": "^1.2.1",
+    "vitest": "^1.2.1"
   },
   "dependencies": {
     "find-up": "^5.0.0",

package/lib/index.js

@@ -1,74 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.configPath = exports.mergeDeep = exports.isObject = exports.loadConfig = exports.importConfigFromPath = void 0;
-const fs_1 = require("fs");
-const find_up_1 = require("find-up");
-// TODO - Add validation here
-const importConfigFromPath = (path) => {
-    if (/\.json$/.test(path)) {
-        return JSON.parse((0, fs_1.readFileSync)(path).toString());
-    }
-    if (/\.(m)?[j|t]s$/.test(path)) {
-        /* eslint-disable */
-        return require(path);
-    }
-    throw new Error(`Path not found: {path}`);
-};
-exports.importConfigFromPath = importConfigFromPath;
-const loadConfig = (input) => {
-    // get the base file
-    const baseConfigFile = (0, exports.configPath)(input);
-    const baseConfig = (0, exports.importConfigFromPath)(baseConfigFile);
-    let overrides = input?.overrides || {};
-    // get the environment file
-    if (input?.env) {
-        const devConfig = (0, exports.importConfigFromPath)((0, exports.configPath)(input));
-        overrides = mergeDeep(devConfig, overrides);
-    }
-    // merge env file
-    return mergeDeep(baseConfig, overrides);
-};
-exports.loadConfig = loadConfig;
-/**
- * Simple object check.
- */
-function isObject(item) {
-    return item && typeof item === "object" && !Array.isArray(item);
-}
-exports.isObject = isObject;
-/**
- * Deep merge two objects.
- */
-function mergeDeep(target, ...sources) {
-    if (!sources.length)
-        return target;
-    const source = sources.shift();
-    if (isObject(target) && isObject(source)) {
-        for (const key in source) {
-            if (isObject(source[key])) {
-                if (!target[key])
-                    Object.assign(target, { [key]: {} });
-                mergeDeep(target[key], source[key]);
-            }
-            else {
-                Object.assign(target, { [key]: source[key] });
-            }
-        }
-    }
-    return mergeDeep(target, ...sources);
-}
-exports.mergeDeep = mergeDeep;
-const configPath = (input) => {
-    const envIndicator = input?.env ? `.${input.env}` : "";
-    const p = (0, find_up_1.sync)([
-        `.axiom${envIndicator}.json`,
-        `.axiom${envIndicator}.js`,
-        `.axiom${envIndicator}.mjs`,
-        `.axiom${envIndicator}.ts`,
-        `.axiom${envIndicator}.mts`,
-    ], { cwd: input?.cwd });
-    if (p === undefined)
-        throw new Error(`Axiom config files not found: .axiom${envIndicator}.json, .axiom${envIndicator}.js .axiom${envIndicator}.ts`);
-    return p;
-};
-exports.configPath = configPath;