@leyyo/env 1.0.6 → 1.0.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/core/env-core.impl.js +6 -0
- package/dist/core/env-core.impl.js.map +1 -1
- package/dist/core/index.types.d.ts +2 -0
- package/dist/field/env-field.impl.d.ts +28 -11
- package/dist/field/env-field.impl.js +84 -26
- package/dist/field/env-field.impl.js.map +1 -1
- package/dist/field/index.types.d.ts +93 -9
- package/dist/scope/env-scope.impl.d.ts +4 -2
- package/dist/scope/env-scope.impl.js +20 -2
- package/dist/scope/env-scope.impl.js.map +1 -1
- package/dist/scope/index.types.d.ts +4 -1
- package/package.json +1 -1
|
@@ -53,6 +53,12 @@ class EnvCoreImpl {
|
|
|
53
53
|
Array.from(this._scopes.values())
|
|
54
54
|
.forEach(ins => ins.$run());
|
|
55
55
|
}
|
|
56
|
+
print() {
|
|
57
|
+
const result = [];
|
|
58
|
+
Array.from(this._scopes.values())
|
|
59
|
+
.forEach(ins => result.push(...ins.$print()));
|
|
60
|
+
return result;
|
|
61
|
+
}
|
|
56
62
|
$addKey(key, scope) {
|
|
57
63
|
if (!this._keys.has(key)) {
|
|
58
64
|
this._keys.set(key, [scope]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env-core.impl.js","sourceRoot":"","sources":["../../src/core/env-core.impl.ts"],"names":[],"mappings":";;;AAAA,0CAAgC;AAChC,4DAAqD;AACrD,0CAAwD;
|
|
1
|
+
{"version":3,"file":"env-core.impl.js","sourceRoot":"","sources":["../../src/core/env-core.impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { EnvScope } from "../scope";
|
|
2
|
+
import type { EnvFieldPrint } from "../field";
|
|
2
3
|
export type EnvBase = Object;
|
|
3
4
|
export interface EnvCore {
|
|
4
5
|
scope<E extends EnvBase = EnvBase>(name: string): EnvScope<E>;
|
|
@@ -8,6 +9,7 @@ export interface EnvCore {
|
|
|
8
9
|
get keys(): Record<string, string[]>;
|
|
9
10
|
get scopes(): string[];
|
|
10
11
|
run(): void;
|
|
12
|
+
print(): EnvFieldPrint[];
|
|
11
13
|
$addKey(key: string, scope: string): void;
|
|
12
14
|
$fromOta(values: EnvBase): void;
|
|
13
15
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { EnumMap } from "@leyyo/common";
|
|
2
|
-
import
|
|
2
|
+
import { EnvField, EnvFieldArray, EnvFieldAssertLambda, EnvFieldBoolean, EnvFieldCastLambda, EnvFieldFloat, EnvFieldInteger, EnvFieldOtaLambda, EnvFieldPrint, EnvFieldSecret, EnvFieldString } from "./index.types";
|
|
3
3
|
import type { EnvScope } from "../scope";
|
|
4
4
|
import type { EnvBase } from "../core";
|
|
5
5
|
import type { KeyValue } from "@leyyo/common/dist/shared";
|
|
@@ -13,6 +13,8 @@ export declare class EnvFieldImpl<E extends EnvBase = EnvBase, Z extends keyof E
|
|
|
13
13
|
private _cast;
|
|
14
14
|
private _def;
|
|
15
15
|
private _required;
|
|
16
|
+
private _secret;
|
|
17
|
+
private _aliases;
|
|
16
18
|
private _array;
|
|
17
19
|
private _otaFn;
|
|
18
20
|
private _initialized;
|
|
@@ -23,22 +25,37 @@ export declare class EnvFieldImpl<E extends EnvBase = EnvBase, Z extends keyof E
|
|
|
23
25
|
private _devOne;
|
|
24
26
|
private _devMore;
|
|
25
27
|
private _initialize;
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
28
|
+
private get _fromDef();
|
|
29
|
+
/** {@inheritDoc} */
|
|
30
|
+
string(_opt?: EnvFieldString): this;
|
|
31
|
+
/** {@inheritDoc} */
|
|
32
|
+
text(_opt?: EnvFieldString): this;
|
|
33
|
+
/** {@inheritDoc} */
|
|
34
|
+
float(_opt?: EnvFieldFloat): this;
|
|
35
|
+
/** {@inheritDoc} */
|
|
36
|
+
integer(_opt?: EnvFieldInteger): this;
|
|
37
|
+
/** {@inheritDoc} */
|
|
38
|
+
boolean(_opt?: EnvFieldBoolean): this;
|
|
39
|
+
/** {@inheritDoc} */
|
|
31
40
|
literal<L extends KeyValue = string>(keys: EnumLiteral<L>): this;
|
|
41
|
+
/** {@inheritDoc} */
|
|
32
42
|
enumeration<L extends KeyValue = string>(map: EnumMap<L>): this;
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
43
|
+
/** {@inheritDoc} */
|
|
44
|
+
def(value: E[Z]): this;
|
|
45
|
+
/** {@inheritDoc} */
|
|
46
|
+
required(): this;
|
|
47
|
+
/** {@inheritDoc} */
|
|
48
|
+
array(_opt?: EnvFieldArray): this;
|
|
49
|
+
secret(_opt?: EnvFieldSecret): this;
|
|
50
|
+
/** {@inheritDoc} */
|
|
37
51
|
ota(fn?: EnvFieldOtaLambda<E, Z>): this;
|
|
52
|
+
/** {@inheritDoc} */
|
|
53
|
+
alias(...keys: string[]): this;
|
|
54
|
+
/** {@inheritDoc} */
|
|
38
55
|
end(): EnvScope<E>;
|
|
39
56
|
$cast(fn: EnvFieldCastLambda<E, Z>): this;
|
|
40
57
|
$assert(fn: EnvFieldAssertLambda): this;
|
|
41
|
-
|
|
58
|
+
$print(): EnvFieldPrint;
|
|
42
59
|
$run(): void;
|
|
43
60
|
$fromOta(value: unknown): void;
|
|
44
61
|
}
|
|
@@ -72,56 +72,87 @@ class EnvFieldImpl {
|
|
|
72
72
|
break;
|
|
73
73
|
}
|
|
74
74
|
}
|
|
75
|
+
get _fromDef() {
|
|
76
|
+
var _a;
|
|
77
|
+
if (this._array) {
|
|
78
|
+
if (common_1.$is.empty(this._def)) {
|
|
79
|
+
return [];
|
|
80
|
+
}
|
|
81
|
+
else if (Array.isArray(this._def)) {
|
|
82
|
+
return this._def;
|
|
83
|
+
}
|
|
84
|
+
return [this._def];
|
|
85
|
+
}
|
|
86
|
+
else {
|
|
87
|
+
return (_a = this._def) !== null && _a !== void 0 ? _a : undefined;
|
|
88
|
+
}
|
|
89
|
+
}
|
|
75
90
|
// region type
|
|
76
|
-
|
|
91
|
+
/** {@inheritDoc} */
|
|
92
|
+
string(_opt) {
|
|
77
93
|
this._type = 'string';
|
|
78
94
|
return this;
|
|
79
95
|
}
|
|
80
|
-
|
|
96
|
+
/** {@inheritDoc} */
|
|
97
|
+
text(_opt) {
|
|
81
98
|
this._type = 'string';
|
|
82
99
|
return this;
|
|
83
100
|
}
|
|
84
|
-
|
|
101
|
+
/** {@inheritDoc} */
|
|
102
|
+
float(_opt) {
|
|
85
103
|
this._type = 'float';
|
|
86
104
|
return this;
|
|
87
105
|
}
|
|
88
|
-
|
|
106
|
+
/** {@inheritDoc} */
|
|
107
|
+
integer(_opt) {
|
|
89
108
|
this._type = 'integer';
|
|
90
109
|
return this;
|
|
91
110
|
}
|
|
92
|
-
|
|
111
|
+
/** {@inheritDoc} */
|
|
112
|
+
boolean(_opt) {
|
|
93
113
|
this._type = 'boolean';
|
|
94
114
|
return this;
|
|
95
115
|
}
|
|
116
|
+
/** {@inheritDoc} */
|
|
96
117
|
literal(keys) {
|
|
97
118
|
this._type = 'literal';
|
|
98
119
|
this._enumKeys = keys;
|
|
99
120
|
return this;
|
|
100
121
|
}
|
|
122
|
+
/** {@inheritDoc} */
|
|
101
123
|
enumeration(map) {
|
|
102
124
|
this._type = 'enumeration';
|
|
103
125
|
this._enumKeys = map;
|
|
104
126
|
return this;
|
|
105
127
|
}
|
|
106
|
-
// endregion
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
128
|
+
// endregion type
|
|
129
|
+
/** {@inheritDoc} */
|
|
130
|
+
def(value) {
|
|
131
|
+
if (!common_1.$is.empty(value)) {
|
|
132
|
+
if (this._array) {
|
|
133
|
+
this._def = Array.isArray(value) ? value : [value];
|
|
134
|
+
}
|
|
135
|
+
else {
|
|
136
|
+
this._def = value;
|
|
137
|
+
}
|
|
110
138
|
}
|
|
111
139
|
return this;
|
|
112
140
|
}
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
return this;
|
|
116
|
-
}
|
|
117
|
-
get required() {
|
|
141
|
+
/** {@inheritDoc} */
|
|
142
|
+
required() {
|
|
118
143
|
this._required = true;
|
|
119
144
|
return this;
|
|
120
145
|
}
|
|
121
|
-
|
|
146
|
+
/** {@inheritDoc} */
|
|
147
|
+
array(_opt) {
|
|
122
148
|
this._array = true;
|
|
123
149
|
return this;
|
|
124
150
|
}
|
|
151
|
+
secret(_opt) {
|
|
152
|
+
this._secret = true;
|
|
153
|
+
return this;
|
|
154
|
+
}
|
|
155
|
+
/** {@inheritDoc} */
|
|
125
156
|
ota(fn) {
|
|
126
157
|
this.scope.$addOta(this.name);
|
|
127
158
|
if (typeof fn === 'function') {
|
|
@@ -129,6 +160,22 @@ class EnvFieldImpl {
|
|
|
129
160
|
}
|
|
130
161
|
return this;
|
|
131
162
|
}
|
|
163
|
+
/** {@inheritDoc} */
|
|
164
|
+
alias(...keys) {
|
|
165
|
+
common_1.$assert.textArray(keys, { field: this._field, method: 'aliases', where: this._where });
|
|
166
|
+
if (keys.length > 0) {
|
|
167
|
+
if (!this._aliases) {
|
|
168
|
+
this._aliases = [];
|
|
169
|
+
}
|
|
170
|
+
keys.forEach(key => {
|
|
171
|
+
if (!this._aliases.includes(key)) {
|
|
172
|
+
this._aliases.push(key);
|
|
173
|
+
}
|
|
174
|
+
});
|
|
175
|
+
}
|
|
176
|
+
return this;
|
|
177
|
+
}
|
|
178
|
+
/** {@inheritDoc} */
|
|
132
179
|
end() {
|
|
133
180
|
return this.scope;
|
|
134
181
|
}
|
|
@@ -140,20 +187,31 @@ class EnvFieldImpl {
|
|
|
140
187
|
this._assert = fn;
|
|
141
188
|
return this;
|
|
142
189
|
}
|
|
143
|
-
|
|
144
|
-
|
|
190
|
+
$print() {
|
|
191
|
+
const result = { key: this._field, scope: this.scope.name, type: this._type };
|
|
192
|
+
if (!this._secret) {
|
|
193
|
+
result.value = process.env[this._field];
|
|
194
|
+
}
|
|
195
|
+
const tags = [];
|
|
145
196
|
if (this._array) {
|
|
146
|
-
|
|
147
|
-
return [];
|
|
148
|
-
}
|
|
149
|
-
else if (Array.isArray(this._def)) {
|
|
150
|
-
return this._def;
|
|
151
|
-
}
|
|
152
|
-
return [this._def];
|
|
197
|
+
tags.push('array');
|
|
153
198
|
}
|
|
154
|
-
|
|
155
|
-
|
|
199
|
+
if (this._required) {
|
|
200
|
+
tags.push('required');
|
|
201
|
+
}
|
|
202
|
+
if (this._secret) {
|
|
203
|
+
tags.push('secret');
|
|
204
|
+
}
|
|
205
|
+
if (this._otaFn) {
|
|
206
|
+
tags.push('ota');
|
|
207
|
+
}
|
|
208
|
+
if (tags.length) {
|
|
209
|
+
result.tags = tags;
|
|
210
|
+
}
|
|
211
|
+
if (this._aliases) {
|
|
212
|
+
result.aliases = this._aliases;
|
|
156
213
|
}
|
|
214
|
+
return result;
|
|
157
215
|
}
|
|
158
216
|
$run() {
|
|
159
217
|
this._initialize();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env-field.impl.js","sourceRoot":"","sources":["../../src/field/env-field.impl.ts"],"names":[],"mappings":";;;AAAA,0CAAiE;AAiBjE,MAAa,YAAY;
|
|
1
|
+
{"version":3,"file":"env-field.impl.js","sourceRoot":"","sources":["../../src/field/env-field.impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,22 +6,106 @@ export type EnvFieldCastLambda<E extends EnvBase = EnvBase, Z extends keyof E =
|
|
|
6
6
|
export type EnvFieldAssertLambda = (v: unknown) => void;
|
|
7
7
|
export type EnvFieldType = 'string' | 'text' | 'float' | 'integer' | 'boolean' | 'literal' | 'enumeration';
|
|
8
8
|
export type EnvFieldOtaLambda<E extends EnvBase = EnvBase, Z extends keyof E = keyof E> = (field: Z, data: E) => void;
|
|
9
|
+
export interface EnvFieldArray {
|
|
10
|
+
char?: ',' | ';' | '/' | '|' | string;
|
|
11
|
+
min?: number;
|
|
12
|
+
max?: number;
|
|
13
|
+
unique?: boolean;
|
|
14
|
+
}
|
|
15
|
+
export interface EnvFieldSecret {
|
|
16
|
+
type?: EnvFieldSecretType;
|
|
17
|
+
}
|
|
18
|
+
export type EnvFieldSecretType = 'password' | 'token' | 'private-key' | 'public-key' | 'api-key' | 'host';
|
|
19
|
+
export interface EnvFieldString {
|
|
20
|
+
min?: number;
|
|
21
|
+
max?: number;
|
|
22
|
+
pattern?: string | RegExp;
|
|
23
|
+
}
|
|
24
|
+
export interface EnvFieldFloat {
|
|
25
|
+
min?: number;
|
|
26
|
+
max?: number;
|
|
27
|
+
}
|
|
28
|
+
export interface EnvFieldInteger {
|
|
29
|
+
min?: number;
|
|
30
|
+
max?: number;
|
|
31
|
+
modulus?: number;
|
|
32
|
+
}
|
|
33
|
+
export interface EnvFieldBoolean {
|
|
34
|
+
yes?: string[];
|
|
35
|
+
no?: string[];
|
|
36
|
+
}
|
|
37
|
+
export type EnvFieldPrintTag = 'required' | 'array' | 'secret' | 'ota';
|
|
38
|
+
export interface EnvFieldPrint {
|
|
39
|
+
scope: string;
|
|
40
|
+
key: string;
|
|
41
|
+
value?: any;
|
|
42
|
+
type: EnvFieldType;
|
|
43
|
+
tags?: EnvFieldPrintTag[];
|
|
44
|
+
aliases?: string[];
|
|
45
|
+
}
|
|
9
46
|
export interface EnvField<E extends EnvBase = EnvBase, Z extends keyof E = keyof E> {
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
47
|
+
/**
|
|
48
|
+
* Key is required
|
|
49
|
+
* */
|
|
50
|
+
required(): this;
|
|
51
|
+
/**
|
|
52
|
+
* Key is array, so value is split by char
|
|
53
|
+
* */
|
|
54
|
+
array(opt?: EnvFieldArray): this;
|
|
55
|
+
/**
|
|
56
|
+
* Key is secret value
|
|
57
|
+
* */
|
|
58
|
+
secret(opt?: EnvFieldSecret): this;
|
|
59
|
+
/**
|
|
60
|
+
* Set default value
|
|
61
|
+
* */
|
|
62
|
+
def(value: E[Z]): this;
|
|
63
|
+
/**
|
|
64
|
+
* Value may have another aliases
|
|
65
|
+
* */
|
|
66
|
+
alias(...keys: string[]): this;
|
|
67
|
+
/**
|
|
68
|
+
* Value is string (can be empty)
|
|
69
|
+
* */
|
|
70
|
+
string(opt?: EnvFieldString): this;
|
|
71
|
+
/**
|
|
72
|
+
* Value is text (can not be empty)
|
|
73
|
+
* */
|
|
74
|
+
text(opt?: EnvFieldString): this;
|
|
75
|
+
/**
|
|
76
|
+
* Value is float
|
|
77
|
+
* */
|
|
78
|
+
float(opt?: EnvFieldFloat): this;
|
|
79
|
+
/**
|
|
80
|
+
* Value is integer
|
|
81
|
+
* */
|
|
82
|
+
integer(opt?: EnvFieldInteger): this;
|
|
83
|
+
/**
|
|
84
|
+
* Value is boolean
|
|
85
|
+
* */
|
|
86
|
+
boolean(opt?: EnvFieldBoolean): this;
|
|
87
|
+
/**
|
|
88
|
+
* Value is literal
|
|
89
|
+
* */
|
|
17
90
|
literal<L extends KeyValue = string>(keys: EnumLiteral<L>): this;
|
|
91
|
+
/**
|
|
92
|
+
* Value is enumeration
|
|
93
|
+
* */
|
|
18
94
|
enumeration<L extends KeyValue = string>(map: EnumMap<L>): this;
|
|
19
|
-
|
|
20
|
-
|
|
95
|
+
/**
|
|
96
|
+
* Value has ota for remote configuration
|
|
97
|
+
* */
|
|
21
98
|
ota(fn?: EnvFieldOtaLambda<E, Z>): this;
|
|
99
|
+
/**
|
|
100
|
+
* Go back to scope
|
|
101
|
+
* */
|
|
22
102
|
end(): EnvScope<E>;
|
|
103
|
+
/**
|
|
104
|
+
* Scope
|
|
105
|
+
* */
|
|
23
106
|
get scope(): EnvScope<E>;
|
|
24
107
|
$run(): void;
|
|
108
|
+
$print(): EnvFieldPrint;
|
|
25
109
|
$fromOta(value: unknown): void;
|
|
26
110
|
$cast(fn: EnvFieldCastLambda<E, Z>): this;
|
|
27
111
|
$assert(fn: EnvFieldAssertLambda): this;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { EnvBase, EnvCore } from "../core";
|
|
2
|
-
import type { EnvField } from "../field";
|
|
2
|
+
import type { EnvField, EnvFieldPrint } from "../field";
|
|
3
3
|
import type { EnvScope } from "./index.types";
|
|
4
4
|
export declare class EnvScopeImpl<E extends EnvBase = EnvBase> implements EnvScope<E> {
|
|
5
5
|
readonly core: EnvCore;
|
|
@@ -12,9 +12,11 @@ export declare class EnvScopeImpl<E extends EnvBase = EnvBase> implements EnvSco
|
|
|
12
12
|
field<Z extends keyof E = keyof E>(name: Z): EnvField<E, Z>;
|
|
13
13
|
get<Z extends keyof E = keyof E>(name: Z): EnvField<E, Z>;
|
|
14
14
|
has<Z extends keyof E = keyof E>(field: Z): boolean;
|
|
15
|
-
uses(scope: string): this;
|
|
15
|
+
uses<E2 extends EnvBase = EnvBase>(scope: string | EnvScope<E2>): this;
|
|
16
16
|
run(): void;
|
|
17
|
+
print(): EnvFieldPrint[];
|
|
17
18
|
get raw(): E;
|
|
19
|
+
$print(): EnvFieldPrint[];
|
|
18
20
|
$run(): void;
|
|
19
21
|
$refresh(): void;
|
|
20
22
|
$addOta(name: keyof E): void;
|
|
@@ -40,14 +40,28 @@ class EnvScopeImpl {
|
|
|
40
40
|
return this._fields.has(field);
|
|
41
41
|
}
|
|
42
42
|
uses(scope) {
|
|
43
|
-
if (
|
|
44
|
-
this.core.
|
|
43
|
+
if (typeof scope === 'string') {
|
|
44
|
+
if (this.core.has(scope)) {
|
|
45
|
+
this.core.get(scope).$run();
|
|
46
|
+
}
|
|
47
|
+
else {
|
|
48
|
+
console.warn(`Not found scope: ${scope}`);
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
else if (common_1.$is.object(scope) && scope instanceof env_field_impl_1.EnvFieldImpl) {
|
|
52
|
+
scope.$run();
|
|
53
|
+
}
|
|
54
|
+
else {
|
|
55
|
+
console.warn(`Invalid scope type: ${typeof scope}`);
|
|
45
56
|
}
|
|
46
57
|
return this;
|
|
47
58
|
}
|
|
48
59
|
run() {
|
|
49
60
|
this.core.run();
|
|
50
61
|
}
|
|
62
|
+
print() {
|
|
63
|
+
return this.core.print();
|
|
64
|
+
}
|
|
51
65
|
get raw() {
|
|
52
66
|
if (this._raw !== undefined) {
|
|
53
67
|
return this._raw;
|
|
@@ -59,6 +73,10 @@ class EnvScopeImpl {
|
|
|
59
73
|
});
|
|
60
74
|
return this._raw;
|
|
61
75
|
}
|
|
76
|
+
$print() {
|
|
77
|
+
return Array.from(this._fields.values())
|
|
78
|
+
.map(field => field.$print());
|
|
79
|
+
}
|
|
62
80
|
$run() {
|
|
63
81
|
if (this._run) {
|
|
64
82
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env-scope.impl.js","sourceRoot":"","sources":["../../src/scope/env-scope.impl.ts"],"names":[],"mappings":";;;AAAA,0CAAgC;AAChC,0CAAwD;AACxD,4DAAqD;AAMrD,MAAM,KAAK,GAAG,GAAG,cAAG,eAAe,CAAC;AAEpC,MAAa,YAAY;IAMrB,YAAqB,IAAa,EAAW,IAAY;QAApC,SAAI,GAAJ,IAAI,CAAS;QAAW,SAAI,GAAJ,IAAI,CAAQ;QAHxC,YAAO,GAAG,cAAK,CAAC,MAAM,CAAuB,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,8BAA8B;QAC7F,aAAQ,GAAG,cAAK,CAAC,QAAQ,CAAU,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC,aAAa;IAGpF,CAAC;IAED,KAAK,CAA8B,IAAO;QACtC,gBAAO,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE;YACpB,OAAO,EAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,IAAI,EAAC,CAAA;QAC1D,CAAC,CAAC,CAAC;QACH,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YACzB,MAAM,aAAI,CAAC,eAAe,CAAC,cAAG,EAAE,GAAG,EAAE,EAAC,OAAO,EAAE,qBAAqB,EAAE,KAAK,EAAE,IAAc,EAAE,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAC,CAAC,CAAC;QAClI,CAAC;QACD,MAAM,GAAG,GAAG,IAAI,6BAAY,CAAO,IAAI,EAAE,IAAI,CAAC,CAAC;QAC/C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QAC5B,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAc,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QAC7C,OAAO,GAAG,CAAC;IACf,CAAC;IACD,GAAG,CAA8B,IAAO;QACpC,gBAAO,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE;YACpB,OAAO,EAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,IAAI,EAAC,CAAA;QAC1D,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YAC1B,MAAM,aAAI,CAAC,eAAe,CAAC,cAAG,EAAE,GAAG,EAAE,EAAC,OAAO,EAAE,uBAAuB,EAAE,KAAK,EAAE,IAAc,EAAE,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAC,CAAC,CAAC;QACpI,CAAC;QACD,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAmB,CAAC;IACpD,CAAC;IACD,GAAG,CAA8B,KAAQ;QACrC,gBAAO,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE;YACrB,OAAO,EAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,IAAI,EAAC,CAAA;QAC1D,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IACnC,CAAC;IACD,IAAI,
|
|
1
|
+
{"version":3,"file":"env-scope.impl.js","sourceRoot":"","sources":["../../src/scope/env-scope.impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,15 +1,18 @@
|
|
|
1
|
-
import type { EnvField } from "../field";
|
|
1
|
+
import type { EnvField, EnvFieldPrint } from "../field";
|
|
2
2
|
import type { EnvBase, EnvCore } from "../core";
|
|
3
3
|
export interface EnvScope<E extends EnvBase = EnvBase> {
|
|
4
4
|
field<Z extends keyof E = keyof E>(field: Z): EnvField<E, Z>;
|
|
5
5
|
get<Z extends keyof E = keyof E>(field: Z): EnvField<E, Z>;
|
|
6
6
|
has<Z extends keyof E = keyof E>(field: Z): boolean;
|
|
7
7
|
uses(scope: string): this;
|
|
8
|
+
uses<E2 extends EnvBase = EnvBase>(scope: EnvScope<E2>): this;
|
|
8
9
|
run(): void;
|
|
10
|
+
print(): EnvFieldPrint[];
|
|
9
11
|
get raw(): E;
|
|
10
12
|
get name(): string;
|
|
11
13
|
get core(): EnvCore;
|
|
12
14
|
$run(): void;
|
|
15
|
+
$print(): EnvFieldPrint[];
|
|
13
16
|
$refresh(): void;
|
|
14
17
|
$fromOta(values: Partial<E>): void;
|
|
15
18
|
$addOta(name: keyof E): void;
|