Comparing version 0.3.10 to 0.3.11
import { NameAnd, NameAndValidator } from "@dbpath/utils"; | ||
import { CleanEnvironment, Environment } from "@dbpath/environments"; | ||
import { Summary } from "@dbpath/config"; | ||
import { CleanScript, Script } from "@dbpath/scripts"; | ||
export interface Config { | ||
environments: NameAnd<Environment>; | ||
summary: Summary; | ||
scripts?: NameAnd<Script>; | ||
} | ||
@@ -11,4 +13,5 @@ export interface CleanConfig { | ||
summary: Summary; | ||
scripts: NameAnd<CleanScript>; | ||
} | ||
export declare const cleanConfig: (envVars: NameAnd<string>) => (config: Config) => CleanConfig; | ||
export declare const envValidator: NameAndValidator<Config>; |
@@ -7,6 +7,11 @@ "use strict"; | ||
const config_1 = require("@dbpath/config"); | ||
const scripts_1 = require("@dbpath/scripts"); | ||
const cleanConfig = (envVars) => (config) => { | ||
const scripts = (0, scripts_1.cleanNameAndScripts)('config', config.scripts); | ||
if ((0, utils_1.hasErrors)(scripts)) | ||
throw Error(`Errors in scripts. This should have been caught sooner: ${JSON.stringify(scripts)}`); | ||
let result = { | ||
environments: (0, environments_1.cleanEnvironment)(envVars, config.environments), | ||
summary: (0, config_1.cleanSummary)(config.summary) | ||
summary: (0, config_1.cleanSummary)(config.summary), | ||
scripts | ||
}; | ||
@@ -16,2 +21,2 @@ return result; | ||
exports.cleanConfig = cleanConfig; | ||
exports.envValidator = (0, utils_1.composeNameAndValidators)((0, utils_1.validateChildDefined)('environments'), (0, utils_1.validateChild)('environments', (0, utils_1.validateNameAnd)(environments_1.environmentValidator)), (0, utils_1.validateChildDefined)('summary'), (0, utils_1.validateChild)('summary', config_1.summaryValidator)); | ||
exports.envValidator = (0, utils_1.composeNameAndValidators)((0, utils_1.validateChildDefined)('environments'), (0, utils_1.validateChild)('environments', (0, utils_1.validateNameAnd)(environments_1.environmentValidator)), (0, utils_1.validateChildDefined)('summary'), (0, utils_1.validateChild)('summary', config_1.summaryValidator), (0, utils_1.validateChild)("scripts", (0, utils_1.validateNameAnd)(scripts_1.validateScript), true)); |
@@ -19,2 +19,3 @@ "use strict"; | ||
const dal_1 = require("@dbpath/dal"); | ||
const scripts_1 = require("@dbpath/scripts"); | ||
const filterLinkPP = (lookfor) => (raw) => { | ||
@@ -87,3 +88,4 @@ let links = raw.filter(l => l.startsWith(lookfor)); | ||
let validator = (0, dal_1.DalPathValidator)(summary, meta); | ||
let plan = (0, pathparser_1.parsePath)(validator)(path); | ||
const scriptIdFn = (0, scripts_1.preprocessorFnForScript)(config.scripts); | ||
let plan = (0, utils_1.mapErrors)((0, pathparser_1.preprocessor)(scriptIdFn, path), (0, pathparser_1.parsePath)(validator)); | ||
if ((0, utils_1.hasErrors)(plan)) | ||
@@ -90,0 +92,0 @@ return plan; |
{ | ||
"name": "dbpath", | ||
"description": "", | ||
"version": "0.3.10", | ||
"version": "0.3.11", | ||
"main": "dist/index", | ||
@@ -24,7 +24,8 @@ "types": "dist/index", | ||
"commander": "^10.0.0", | ||
"@dbpath/tables": "0.3.10", | ||
"@dbpath/pathparser": "0.3.10", | ||
"@dbpath/utils": "0.3.10", | ||
"@dbpath/files": "0.3.10", | ||
"@dbpath/environments": "0.3.10" | ||
"@dbpath/tables": "0.3.11", | ||
"@dbpath/pathparser": "0.3.11", | ||
"@dbpath/utils": "0.3.11", | ||
"@dbpath/files": "0.3.11", | ||
"@dbpath/scripts": "0.3.11", | ||
"@dbpath/environments": "0.3.11" | ||
}, | ||
@@ -31,0 +32,0 @@ "devDependencies": { |
80721
1193
7
+ Added@dbpath/scripts@0.3.11
+ Added@dbpath/config@0.3.11(transitive)
+ Added@dbpath/dal@0.3.11(transitive)
+ Added@dbpath/environments@0.3.11(transitive)
+ Added@dbpath/files@0.3.11(transitive)
+ Added@dbpath/fixtures@0.3.11(transitive)
+ Added@dbpath/mysql@0.3.11(transitive)
+ Added@dbpath/oracle@0.3.11(transitive)
+ Added@dbpath/pathparser@0.3.11(transitive)
+ Added@dbpath/postgres@0.3.11(transitive)
+ Added@dbpath/scripts@0.3.11(transitive)
+ Added@dbpath/tables@0.3.11(transitive)
+ Added@dbpath/types@0.3.11(transitive)
+ Added@dbpath/utils@0.3.11(transitive)
- Removed@dbpath/config@0.3.10(transitive)
- Removed@dbpath/dal@0.3.10(transitive)
- Removed@dbpath/environments@0.3.10(transitive)
- Removed@dbpath/files@0.3.10(transitive)
- Removed@dbpath/fixtures@0.3.10(transitive)
- Removed@dbpath/mysql@0.3.10(transitive)
- Removed@dbpath/oracle@0.3.10(transitive)
- Removed@dbpath/pathparser@0.3.10(transitive)
- Removed@dbpath/postgres@0.3.10(transitive)
- Removed@dbpath/tables@0.3.10(transitive)
- Removed@dbpath/types@0.3.10(transitive)
- Removed@dbpath/utils@0.3.10(transitive)
Updated@dbpath/environments@0.3.11
Updated@dbpath/files@0.3.11
Updated@dbpath/pathparser@0.3.11
Updated@dbpath/tables@0.3.11
Updated@dbpath/utils@0.3.11