@adviser/cement 0.4.16 → 0.4.18
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/cjs/node/node-env-actions.cjs +3 -37
- package/cjs/node/node-env-actions.cjs.map +1 -1
- package/cjs/sys-env.test.cjs +16 -41
- package/cjs/sys-env.test.cjs.map +1 -1
- package/esm/node/node-env-actions.d.ts +0 -11
- package/esm/node/node-env-actions.d.ts.map +1 -1
- package/esm/node/node-env-actions.js +1 -35
- package/esm/node/node-env-actions.js.map +1 -1
- package/esm/sys-env.test.js +16 -41
- package/esm/sys-env.test.js.map +1 -1
- package/package.json +3 -3
- package/src/jsr.json +1 -1
- package/src/node/node-env-actions.ts +49 -46
- package/ts/cjs/node/node-env-actions.js +3 -37
- package/ts/cjs/node/node-env-actions.js.map +1 -1
- package/ts/cjs/sys-env.test.js +16 -41
- package/ts/cjs/sys-env.test.js.map +1 -1
- package/ts/esm/node/node-env-actions.d.ts +0 -11
- package/ts/esm/node/node-env-actions.d.ts.map +1 -1
- package/ts/esm/node/node-env-actions.js +1 -35
- package/ts/esm/node/node-env-actions.js.map +1 -1
- package/ts/esm/sys-env.test.js +16 -41
- package/ts/esm/sys-env.test.js.map +1 -1
@@ -4,51 +4,18 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
|
|
4
4
|
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
|
5
5
|
return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
|
6
6
|
};
|
7
|
-
var _NodeEnvActions_node
|
7
|
+
var _NodeEnvActions_node;
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
9
9
|
exports.NodeEnvActions = void 0;
|
10
10
|
const resolve_once_js_1 = require("../resolve-once.cjs");
|
11
11
|
const runtime_js_1 = require("../runtime.cjs");
|
12
12
|
class NodeEnvActions {
|
13
|
-
static addCleanPrefix(prefix) {
|
14
|
-
if (!prefix.endsWith("_")) {
|
15
|
-
prefix += "_";
|
16
|
-
}
|
17
|
-
if (!NodeEnvActions.cleanPrefixes.includes(prefix)) {
|
18
|
-
NodeEnvActions.cleanPrefixes.push(prefix);
|
19
|
-
}
|
20
|
-
}
|
21
|
-
cleanImportMetaEnv() {
|
22
|
-
const metaEnv = __classPrivateFieldGet(this, _NodeEnvActions_importMetaEnv, "f").import?.meta?.env || {};
|
23
|
-
const cleaned = {};
|
24
|
-
for (const key of Object.keys(metaEnv)) {
|
25
|
-
const hasCleanPrefix = NodeEnvActions.cleanPrefixes.find((prefix) => key.startsWith(prefix));
|
26
|
-
if (hasCleanPrefix) {
|
27
|
-
const cleanedPrefix = key.replace(hasCleanPrefix, "");
|
28
|
-
const foundCleanPrefix = cleaned[cleanedPrefix];
|
29
|
-
if (!foundCleanPrefix) {
|
30
|
-
cleaned[cleanedPrefix] = metaEnv[key];
|
31
|
-
}
|
32
|
-
}
|
33
|
-
cleaned[key] = metaEnv[key];
|
34
|
-
}
|
35
|
-
return cleaned;
|
36
|
-
}
|
37
|
-
mergeEnv() {
|
38
|
-
const importMetaEnv = this.cleanImportMetaEnv();
|
39
|
-
const nodeEnv = Object.keys(__classPrivateFieldGet(this, _NodeEnvActions_node, "f").process.env).reduce((acc, key) => {
|
40
|
-
acc[key] = __classPrivateFieldGet(this, _NodeEnvActions_node, "f").process.env[key] || "";
|
41
|
-
return acc;
|
42
|
-
}, {});
|
43
|
-
return { ...importMetaEnv, ...nodeEnv };
|
44
|
-
}
|
45
13
|
static new(opts) {
|
46
14
|
return NodeEnvActions.once.once(() => new NodeEnvActions(opts));
|
47
15
|
}
|
48
16
|
constructor(opts) {
|
49
17
|
_NodeEnvActions_node.set(this, globalThis);
|
50
|
-
|
51
|
-
this._env = this.active() ? this.mergeEnv() : {};
|
18
|
+
this._env = this.active() ? __classPrivateFieldGet(this, _NodeEnvActions_node, "f").process.env : {};
|
52
19
|
this.opts = opts;
|
53
20
|
}
|
54
21
|
register(env) {
|
@@ -76,7 +43,6 @@ class NodeEnvActions {
|
|
76
43
|
}
|
77
44
|
}
|
78
45
|
exports.NodeEnvActions = NodeEnvActions;
|
79
|
-
_NodeEnvActions_node = new WeakMap()
|
46
|
+
_NodeEnvActions_node = new WeakMap();
|
80
47
|
NodeEnvActions.once = new resolve_once_js_1.ResolveOnce();
|
81
|
-
NodeEnvActions.cleanPrefixes = ["VITE_"];
|
82
48
|
//# sourceMappingURL=node-env-actions.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"node-env-actions.js","sourceRoot":"","sources":["../../../../src/node/node-env-actions.ts"],"names":[],"mappings":";;;;;;;;;AAAA,wDAAiD;AACjD,8CAA0C;AAU1C,MAAa,cAAc;
|
1
|
+
{"version":3,"file":"node-env-actions.js","sourceRoot":"","sources":["../../../../src/node/node-env-actions.ts"],"names":[],"mappings":";;;;;;;;;AAAA,wDAAiD;AACjD,8CAA0C;AAU1C,MAAa,cAAc;IA4CzB,MAAM,CAAC,GAAG,CAAC,IAA6B;QACtC,OAAO,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC;IAClE,CAAC;IAGD,YAAoB,IAA6B;QAtCxC,+BAAQ,UAAqE,EAAC;QAqD9E,SAAI,GAA2B,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,uBAAA,IAAI,4BAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QAdlF,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAED,QAAQ,CAAC,GAAQ;QACf,KAAK,MAAM,GAAG,IAAI,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC;YAC7B,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;QACtC,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAED,MAAM;QACJ,OAAO,IAAA,sBAAS,GAAE,CAAC,SAAS,CAAC;IAE/B,CAAC;IAED,IAAI;QACF,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC;IACD,GAAG,CAAC,GAAW;QACb,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACxB,CAAC;IACD,GAAG,CAAC,GAAW,EAAE,KAAc;QAC7B,IAAI,KAAK,EAAE,CAAC;YACV,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QAEzB,CAAC;IACH,CAAC;IACD,MAAM,CAAC,GAAW;QAEhB,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAGxB,CAAC;;AAlFH,wCAmFC;;AAlFQ,mBAAI,GAAG,IAAI,6BAAW,EAAkB,AAApC,CAAqC"}
|
package/cjs/sys-env.test.cjs
CHANGED
@@ -14,7 +14,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
14
14
|
const cement_1 = require("@adviser/cement");
|
15
15
|
const cf_env_actions_js_1 = require("./cf/cf-env-actions.cjs");
|
16
16
|
const web_env_actions_js_1 = require("./web/web-env-actions.cjs");
|
17
|
-
const node_env_actions_js_1 = require("./node/node-env-actions.cjs");
|
18
17
|
describe("sys_env", () => {
|
19
18
|
let key;
|
20
19
|
const envImpl = (0, cement_1.envFactory)();
|
@@ -182,45 +181,21 @@ describe("sys_env", () => {
|
|
182
181
|
expect(envImpl.get("key7")).toBe("value7");
|
183
182
|
expect(envImpl.get("key8")).toBe("value8");
|
184
183
|
});
|
185
|
-
|
186
|
-
|
187
|
-
|
188
|
-
|
189
|
-
|
190
|
-
|
191
|
-
|
192
|
-
|
193
|
-
|
194
|
-
|
195
|
-
|
196
|
-
|
197
|
-
|
198
|
-
|
199
|
-
|
200
|
-
GURKE_GURKE: "gurke-gurke",
|
201
|
-
},
|
202
|
-
},
|
203
|
-
};
|
204
|
-
node_env_actions_js_1.NodeEnvActions.once.reset();
|
205
|
-
const env = (0, cement_1.envFactory)({
|
206
|
-
symbol: "this-is-a-test",
|
207
|
-
id: "this-is-a-test-id",
|
208
|
-
});
|
209
|
-
const ret = env.gets("HELLO", "VITE_HELLO", "GURKE_HELLO", "VITE_SOME", "GURKE_SOME", "SOME", "VITE", "GURKE", "VITE_VITE", "GURKE_GURKE");
|
210
|
-
expect(ret.isOk()).toBeTruthy();
|
211
|
-
expect(ret.unwrap()).toEqual({
|
212
|
-
HELLO: "world",
|
213
|
-
VITE_HELLO: "vite-world",
|
214
|
-
GURKE_HELLO: "gurke-world",
|
215
|
-
VITE_SOME: "vite-some",
|
216
|
-
GURKE_SOME: "gurke-some",
|
217
|
-
SOME: "vite-some",
|
218
|
-
VITE: "vite-vite",
|
219
|
-
VITE_VITE: "vite-vite",
|
220
|
-
GURKE: "gurke-gurke",
|
221
|
-
GURKE_GURKE: "gurke-gurke",
|
222
|
-
});
|
223
|
-
});
|
184
|
+
it("set into provider", () => {
|
185
|
+
const key = `ENV-${Math.random()}`;
|
186
|
+
envImpl.set(key, "value");
|
187
|
+
expect(envImpl.get(key)).toBe("value");
|
188
|
+
if ((0, cement_1.runtimeFn)().isNodeIsh) {
|
189
|
+
expect(process.env[key]).toBe("value");
|
190
|
+
}
|
191
|
+
envImpl.delete(key);
|
192
|
+
expect(envImpl.get(key)).toBeUndefined();
|
193
|
+
if ((0, cement_1.runtimeFn)().isNodeIsh) {
|
194
|
+
expect(process.env[key]).toBeUndefined();
|
195
|
+
}
|
196
|
+
if ((0, cement_1.runtimeFn)().isDeno) {
|
197
|
+
expect(Deno.env.get(key)).toBeUndefined();
|
198
|
+
}
|
224
199
|
});
|
225
|
-
}
|
200
|
+
});
|
226
201
|
//# sourceMappingURL=sys-env.test.js.map
|
package/cjs/sys-env.test.cjs.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"sys-env.test.js","sourceRoot":"","sources":["../../../src/sys-env.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,4CAA4H;AAC5H,8DAAsD;AACtD,iEAA6D;
|
1
|
+
{"version":3,"file":"sys-env.test.js","sourceRoot":"","sources":["../../../src/sys-env.test.ts"],"names":[],"mappings":"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"}
|
@@ -1,19 +1,8 @@
|
|
1
1
|
import { ResolveOnce } from "../resolve-once.js";
|
2
2
|
import { Env, EnvActions, EnvFactoryOpts } from "../sys-env.js";
|
3
|
-
export interface ImportMetaEnv {
|
4
|
-
import?: {
|
5
|
-
meta?: {
|
6
|
-
env?: Record<string, string>;
|
7
|
-
};
|
8
|
-
};
|
9
|
-
}
|
10
3
|
export declare class NodeEnvActions implements EnvActions {
|
11
4
|
#private;
|
12
5
|
static once: ResolveOnce<NodeEnvActions, void>;
|
13
|
-
static cleanPrefixes: string[];
|
14
|
-
static addCleanPrefix(prefix: string): void;
|
15
|
-
cleanImportMetaEnv(): Record<string, string>;
|
16
|
-
mergeEnv(): Record<string, string>;
|
17
6
|
static new(opts: Partial<EnvFactoryOpts>): EnvActions;
|
18
7
|
readonly opts: Partial<EnvFactoryOpts>;
|
19
8
|
private constructor();
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"node-env-actions.d.ts","sourceRoot":"","sources":["../../../../src/node/node-env-actions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,OAAO,EAAE,GAAG,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;
|
1
|
+
{"version":3,"file":"node-env-actions.d.ts","sourceRoot":"","sources":["../../../../src/node/node-env-actions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,OAAO,EAAE,GAAG,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAShE,qBAAa,cAAe,YAAW,UAAU;;IAC/C,MAAM,CAAC,IAAI,oCAAqC;IA2ChD,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG,UAAU;IAIrD,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;IACvC,OAAO;IAIP,QAAQ,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG;IAOvB,MAAM,IAAI,OAAO;IAIjB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAA+C;IACpF,IAAI,IAAI,MAAM,EAAE;IAGhB,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAGpC,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI;IAMtC,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;CAM1B"}
|
@@ -2,41 +2,7 @@ import { ResolveOnce } from "../resolve-once.js";
|
|
2
2
|
import { runtimeFn } from "../runtime.js";
|
3
3
|
export class NodeEnvActions {
|
4
4
|
static once = new ResolveOnce();
|
5
|
-
static cleanPrefixes = ["VITE_"];
|
6
|
-
static addCleanPrefix(prefix) {
|
7
|
-
if (!prefix.endsWith("_")) {
|
8
|
-
prefix += "_";
|
9
|
-
}
|
10
|
-
if (!NodeEnvActions.cleanPrefixes.includes(prefix)) {
|
11
|
-
NodeEnvActions.cleanPrefixes.push(prefix);
|
12
|
-
}
|
13
|
-
}
|
14
5
|
#node = globalThis;
|
15
|
-
#importMetaEnv = globalThis;
|
16
|
-
cleanImportMetaEnv() {
|
17
|
-
const metaEnv = this.#importMetaEnv.import?.meta?.env || {};
|
18
|
-
const cleaned = {};
|
19
|
-
for (const key of Object.keys(metaEnv)) {
|
20
|
-
const hasCleanPrefix = NodeEnvActions.cleanPrefixes.find((prefix) => key.startsWith(prefix));
|
21
|
-
if (hasCleanPrefix) {
|
22
|
-
const cleanedPrefix = key.replace(hasCleanPrefix, "");
|
23
|
-
const foundCleanPrefix = cleaned[cleanedPrefix];
|
24
|
-
if (!foundCleanPrefix) {
|
25
|
-
cleaned[cleanedPrefix] = metaEnv[key];
|
26
|
-
}
|
27
|
-
}
|
28
|
-
cleaned[key] = metaEnv[key];
|
29
|
-
}
|
30
|
-
return cleaned;
|
31
|
-
}
|
32
|
-
mergeEnv() {
|
33
|
-
const importMetaEnv = this.cleanImportMetaEnv();
|
34
|
-
const nodeEnv = Object.keys(this.#node.process.env).reduce((acc, key) => {
|
35
|
-
acc[key] = this.#node.process.env[key] || "";
|
36
|
-
return acc;
|
37
|
-
}, {});
|
38
|
-
return { ...importMetaEnv, ...nodeEnv };
|
39
|
-
}
|
40
6
|
static new(opts) {
|
41
7
|
return NodeEnvActions.once.once(() => new NodeEnvActions(opts));
|
42
8
|
}
|
@@ -53,7 +19,7 @@ export class NodeEnvActions {
|
|
53
19
|
active() {
|
54
20
|
return runtimeFn().isNodeIsh;
|
55
21
|
}
|
56
|
-
_env = this.active() ? this.
|
22
|
+
_env = this.active() ? this.#node.process.env : {};
|
57
23
|
keys() {
|
58
24
|
return Object.keys(this._env);
|
59
25
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"node-env-actions.js","sourceRoot":"","sources":["../../../../src/node/node-env-actions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAU1C,MAAM,OAAO,cAAc;IACzB,MAAM,CAAC,IAAI,GAAG,IAAI,WAAW,EAAkB,CAAC;
|
1
|
+
{"version":3,"file":"node-env-actions.js","sourceRoot":"","sources":["../../../../src/node/node-env-actions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAU1C,MAAM,OAAO,cAAc;IACzB,MAAM,CAAC,IAAI,GAAG,IAAI,WAAW,EAAkB,CAAC;IAUvC,KAAK,GAAG,UAAqE,CAAC;IAiCvF,MAAM,CAAC,GAAG,CAAC,IAA6B;QACtC,OAAO,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC;IAClE,CAAC;IAEQ,IAAI,CAA0B;IACvC,YAAoB,IAA6B;QAC/C,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAED,QAAQ,CAAC,GAAQ;QACf,KAAK,MAAM,GAAG,IAAI,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC;YAC7B,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;QACtC,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAED,MAAM;QACJ,OAAO,SAAS,EAAE,CAAC,SAAS,CAAC;IAE/B,CAAC;IACQ,IAAI,GAA2B,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;IACpF,IAAI;QACF,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC;IACD,GAAG,CAAC,GAAW;QACb,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACxB,CAAC;IACD,GAAG,CAAC,GAAW,EAAE,KAAc;QAC7B,IAAI,KAAK,EAAE,CAAC;YACV,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QAEzB,CAAC;IACH,CAAC;IACD,MAAM,CAAC,GAAW;QAEhB,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAGxB,CAAC"}
|
package/esm/sys-env.test.js
CHANGED
@@ -1,7 +1,6 @@
|
|
1
1
|
import { EnvImpl, envFactory, registerEnvAction, runtimeFn, param } from "@adviser/cement";
|
2
2
|
import { CFEnvActions } from "./cf/cf-env-actions.js";
|
3
3
|
import { BrowserEnvActions } from "./web/web-env-actions.js";
|
4
|
-
import { NodeEnvActions } from "./node/node-env-actions.js";
|
5
4
|
describe("sys_env", () => {
|
6
5
|
let key;
|
7
6
|
const envImpl = envFactory();
|
@@ -167,45 +166,21 @@ describe("sys_env", () => {
|
|
167
166
|
expect(envImpl.get("key7")).toBe("value7");
|
168
167
|
expect(envImpl.get("key8")).toBe("value8");
|
169
168
|
});
|
170
|
-
|
171
|
-
|
172
|
-
|
173
|
-
|
174
|
-
|
175
|
-
|
176
|
-
|
177
|
-
|
178
|
-
|
179
|
-
|
180
|
-
|
181
|
-
|
182
|
-
|
183
|
-
|
184
|
-
|
185
|
-
GURKE_GURKE: "gurke-gurke",
|
186
|
-
},
|
187
|
-
},
|
188
|
-
};
|
189
|
-
NodeEnvActions.once.reset();
|
190
|
-
const env = envFactory({
|
191
|
-
symbol: "this-is-a-test",
|
192
|
-
id: "this-is-a-test-id",
|
193
|
-
});
|
194
|
-
const ret = env.gets("HELLO", "VITE_HELLO", "GURKE_HELLO", "VITE_SOME", "GURKE_SOME", "SOME", "VITE", "GURKE", "VITE_VITE", "GURKE_GURKE");
|
195
|
-
expect(ret.isOk()).toBeTruthy();
|
196
|
-
expect(ret.unwrap()).toEqual({
|
197
|
-
HELLO: "world",
|
198
|
-
VITE_HELLO: "vite-world",
|
199
|
-
GURKE_HELLO: "gurke-world",
|
200
|
-
VITE_SOME: "vite-some",
|
201
|
-
GURKE_SOME: "gurke-some",
|
202
|
-
SOME: "vite-some",
|
203
|
-
VITE: "vite-vite",
|
204
|
-
VITE_VITE: "vite-vite",
|
205
|
-
GURKE: "gurke-gurke",
|
206
|
-
GURKE_GURKE: "gurke-gurke",
|
207
|
-
});
|
208
|
-
});
|
169
|
+
it("set into provider", () => {
|
170
|
+
const key = `ENV-${Math.random()}`;
|
171
|
+
envImpl.set(key, "value");
|
172
|
+
expect(envImpl.get(key)).toBe("value");
|
173
|
+
if (runtimeFn().isNodeIsh) {
|
174
|
+
expect(process.env[key]).toBe("value");
|
175
|
+
}
|
176
|
+
envImpl.delete(key);
|
177
|
+
expect(envImpl.get(key)).toBeUndefined();
|
178
|
+
if (runtimeFn().isNodeIsh) {
|
179
|
+
expect(process.env[key]).toBeUndefined();
|
180
|
+
}
|
181
|
+
if (runtimeFn().isDeno) {
|
182
|
+
expect(Deno.env.get(key)).toBeUndefined();
|
183
|
+
}
|
209
184
|
});
|
210
|
-
}
|
185
|
+
});
|
211
186
|
//# sourceMappingURL=sys-env.test.js.map
|
package/esm/sys-env.test.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"sys-env.test.js","sourceRoot":"","sources":["../../../src/sys-env.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmC,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAC5H,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;
|
1
|
+
{"version":3,"file":"sys-env.test.js","sourceRoot":"","sources":["../../../src/sys-env.test.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@adviser/cement",
|
3
|
-
"version": "0.4.
|
3
|
+
"version": "0.4.18",
|
4
4
|
"description": "better try/catch/finally handling",
|
5
5
|
"main": "./cjs/index.js",
|
6
6
|
"type": "module",
|
@@ -48,7 +48,7 @@
|
|
48
48
|
"yaml": "^2.7.1"
|
49
49
|
},
|
50
50
|
"devDependencies": {
|
51
|
-
"@cloudflare/vitest-pool-workers": "^0.8.
|
51
|
+
"@cloudflare/vitest-pool-workers": "^0.8.44",
|
52
52
|
"@eslint/js": "^9.20.0",
|
53
53
|
"@types/node": "^24.0.0",
|
54
54
|
"@typescript-eslint/eslint-plugin": "^8.7.0",
|
@@ -56,7 +56,7 @@
|
|
56
56
|
"@vitest/browser": "^3.2.3",
|
57
57
|
"esbuild-plugin-replace": "^1.4.0",
|
58
58
|
"esbuild-plugin-resolve": "^2.0.0",
|
59
|
-
"eslint": "9.
|
59
|
+
"eslint": "9.29.0",
|
60
60
|
"jscodeshift": "^17.3.0",
|
61
61
|
"playwright": "^1.51.1",
|
62
62
|
"playwright-chromium": "^1.51.1",
|
package/src/jsr.json
CHANGED
@@ -2,56 +2,56 @@ import { ResolveOnce } from "../resolve-once.js";
|
|
2
2
|
import { runtimeFn } from "../runtime.js";
|
3
3
|
import { Env, EnvActions, EnvFactoryOpts } from "../sys-env.js";
|
4
4
|
|
5
|
-
export interface ImportMetaEnv {
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
}
|
5
|
+
// export interface ImportMetaEnv {
|
6
|
+
// import?: {
|
7
|
+
// meta?: {
|
8
|
+
// env?: Record<string, string>;
|
9
|
+
// };
|
10
|
+
// };
|
11
|
+
// }
|
12
12
|
export class NodeEnvActions implements EnvActions {
|
13
13
|
static once = new ResolveOnce<NodeEnvActions>();
|
14
|
-
static cleanPrefixes = ["VITE_"];
|
15
|
-
static addCleanPrefix(prefix: string): void {
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
}
|
14
|
+
// static cleanPrefixes = ["VITE_"];
|
15
|
+
// static addCleanPrefix(prefix: string): void {
|
16
|
+
// if (!prefix.endsWith("_")) {
|
17
|
+
// prefix += "_";
|
18
|
+
// }
|
19
|
+
// if (!NodeEnvActions.cleanPrefixes.includes(prefix)) {
|
20
|
+
// NodeEnvActions.cleanPrefixes.push(prefix);
|
21
|
+
// }
|
22
|
+
// }
|
23
23
|
readonly #node = globalThis as unknown as { process: { env: Record<string, string> } };
|
24
|
-
readonly #importMetaEnv = globalThis as unknown as ImportMetaEnv;
|
24
|
+
// readonly #importMetaEnv = globalThis as unknown as ImportMetaEnv;
|
25
25
|
|
26
|
-
cleanImportMetaEnv(): Record<string, string> {
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
}
|
26
|
+
// cleanImportMetaEnv(): Record<string, string> {
|
27
|
+
// const metaEnv = this.#importMetaEnv.import?.meta?.env || {};
|
28
|
+
// const cleaned: Record<string, string> = {};
|
29
|
+
// for (const key of Object.keys(metaEnv)) {
|
30
|
+
// const hasCleanPrefix = NodeEnvActions.cleanPrefixes.find((prefix) => key.startsWith(prefix));
|
31
|
+
// if (hasCleanPrefix) {
|
32
|
+
// const cleanedPrefix = key.replace(hasCleanPrefix, "");
|
33
|
+
// const foundCleanPrefix = cleaned[cleanedPrefix];
|
34
|
+
// if (!foundCleanPrefix) {
|
35
|
+
// cleaned[cleanedPrefix] = metaEnv[key];
|
36
|
+
// }
|
37
|
+
// }
|
38
|
+
// cleaned[key] = metaEnv[key];
|
39
|
+
// }
|
40
|
+
// return cleaned;
|
41
|
+
// }
|
42
42
|
|
43
|
-
mergeEnv(): Record<string, string> {
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
}
|
43
|
+
// mergeEnv(): Record<string, string> {
|
44
|
+
// // const importMetaEnv = this.cleanImportMetaEnv();
|
45
|
+
// // console.debug("NodeEnvActions.mergeEnv", importMetaEnv);
|
46
|
+
// const nodeEnv = Object.keys(this.#node.process.env).reduce(
|
47
|
+
// (acc, key) => {
|
48
|
+
// acc[key] = this.#node.process.env[key] || "";
|
49
|
+
// return acc;
|
50
|
+
// },
|
51
|
+
// {} as Record<string, string>,
|
52
|
+
// );
|
53
|
+
// return { ...nodeEnv };
|
54
|
+
// }
|
55
55
|
|
56
56
|
static new(opts: Partial<EnvFactoryOpts>): EnvActions {
|
57
57
|
return NodeEnvActions.once.once(() => new NodeEnvActions(opts));
|
@@ -73,7 +73,7 @@ export class NodeEnvActions implements EnvActions {
|
|
73
73
|
return runtimeFn().isNodeIsh;
|
74
74
|
// typeof this.#node === "object" && typeof this.#node.process === "object" && typeof this.#node.process.env === "object";
|
75
75
|
}
|
76
|
-
readonly _env: Record<string, string> = this.active() ? this.
|
76
|
+
readonly _env: Record<string, string> = this.active() ? this.#node.process.env : {};
|
77
77
|
keys(): string[] {
|
78
78
|
return Object.keys(this._env);
|
79
79
|
}
|
@@ -83,10 +83,13 @@ export class NodeEnvActions implements EnvActions {
|
|
83
83
|
set(key: string, value?: string): void {
|
84
84
|
if (value) {
|
85
85
|
this._env[key] = value;
|
86
|
+
// this.#node.process.env[key] = value; // also set in process.env
|
86
87
|
}
|
87
88
|
}
|
88
89
|
delete(key: string): void {
|
89
90
|
// eslint-disable-next-line @typescript-eslint/no-dynamic-delete
|
90
91
|
delete this._env[key];
|
92
|
+
// eslint-disable-next-line @typescript-eslint/no-dynamic-delete
|
93
|
+
// delete this.#node.process.env[key]; // also delete in process.env
|
91
94
|
}
|
92
95
|
}
|
@@ -4,51 +4,18 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
|
|
4
4
|
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
|
5
5
|
return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
|
6
6
|
};
|
7
|
-
var _NodeEnvActions_node
|
7
|
+
var _NodeEnvActions_node;
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
9
9
|
exports.NodeEnvActions = void 0;
|
10
10
|
const resolve_once_js_1 = require("../resolve-once.js");
|
11
11
|
const runtime_js_1 = require("../runtime.js");
|
12
12
|
class NodeEnvActions {
|
13
|
-
static addCleanPrefix(prefix) {
|
14
|
-
if (!prefix.endsWith("_")) {
|
15
|
-
prefix += "_";
|
16
|
-
}
|
17
|
-
if (!NodeEnvActions.cleanPrefixes.includes(prefix)) {
|
18
|
-
NodeEnvActions.cleanPrefixes.push(prefix);
|
19
|
-
}
|
20
|
-
}
|
21
|
-
cleanImportMetaEnv() {
|
22
|
-
const metaEnv = __classPrivateFieldGet(this, _NodeEnvActions_importMetaEnv, "f").import?.meta?.env || {};
|
23
|
-
const cleaned = {};
|
24
|
-
for (const key of Object.keys(metaEnv)) {
|
25
|
-
const hasCleanPrefix = NodeEnvActions.cleanPrefixes.find((prefix) => key.startsWith(prefix));
|
26
|
-
if (hasCleanPrefix) {
|
27
|
-
const cleanedPrefix = key.replace(hasCleanPrefix, "");
|
28
|
-
const foundCleanPrefix = cleaned[cleanedPrefix];
|
29
|
-
if (!foundCleanPrefix) {
|
30
|
-
cleaned[cleanedPrefix] = metaEnv[key];
|
31
|
-
}
|
32
|
-
}
|
33
|
-
cleaned[key] = metaEnv[key];
|
34
|
-
}
|
35
|
-
return cleaned;
|
36
|
-
}
|
37
|
-
mergeEnv() {
|
38
|
-
const importMetaEnv = this.cleanImportMetaEnv();
|
39
|
-
const nodeEnv = Object.keys(__classPrivateFieldGet(this, _NodeEnvActions_node, "f").process.env).reduce((acc, key) => {
|
40
|
-
acc[key] = __classPrivateFieldGet(this, _NodeEnvActions_node, "f").process.env[key] || "";
|
41
|
-
return acc;
|
42
|
-
}, {});
|
43
|
-
return { ...importMetaEnv, ...nodeEnv };
|
44
|
-
}
|
45
13
|
static new(opts) {
|
46
14
|
return NodeEnvActions.once.once(() => new NodeEnvActions(opts));
|
47
15
|
}
|
48
16
|
constructor(opts) {
|
49
17
|
_NodeEnvActions_node.set(this, globalThis);
|
50
|
-
|
51
|
-
this._env = this.active() ? this.mergeEnv() : {};
|
18
|
+
this._env = this.active() ? __classPrivateFieldGet(this, _NodeEnvActions_node, "f").process.env : {};
|
52
19
|
this.opts = opts;
|
53
20
|
}
|
54
21
|
register(env) {
|
@@ -76,7 +43,6 @@ class NodeEnvActions {
|
|
76
43
|
}
|
77
44
|
}
|
78
45
|
exports.NodeEnvActions = NodeEnvActions;
|
79
|
-
_NodeEnvActions_node = new WeakMap()
|
46
|
+
_NodeEnvActions_node = new WeakMap();
|
80
47
|
NodeEnvActions.once = new resolve_once_js_1.ResolveOnce();
|
81
|
-
NodeEnvActions.cleanPrefixes = ["VITE_"];
|
82
48
|
//# sourceMappingURL=node-env-actions.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"node-env-actions.js","sourceRoot":"","sources":["../../../../src/node/node-env-actions.ts"],"names":[],"mappings":";;;;;;;;;AAAA,wDAAiD;AACjD,8CAA0C;AAU1C,MAAa,cAAc;
|
1
|
+
{"version":3,"file":"node-env-actions.js","sourceRoot":"","sources":["../../../../src/node/node-env-actions.ts"],"names":[],"mappings":";;;;;;;;;AAAA,wDAAiD;AACjD,8CAA0C;AAU1C,MAAa,cAAc;IA4CzB,MAAM,CAAC,GAAG,CAAC,IAA6B;QACtC,OAAO,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC;IAClE,CAAC;IAGD,YAAoB,IAA6B;QAtCxC,+BAAQ,UAAqE,EAAC;QAqD9E,SAAI,GAA2B,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,uBAAA,IAAI,4BAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QAdlF,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAED,QAAQ,CAAC,GAAQ;QACf,KAAK,MAAM,GAAG,IAAI,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC;YAC7B,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;QACtC,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAED,MAAM;QACJ,OAAO,IAAA,sBAAS,GAAE,CAAC,SAAS,CAAC;IAE/B,CAAC;IAED,IAAI;QACF,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC;IACD,GAAG,CAAC,GAAW;QACb,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACxB,CAAC;IACD,GAAG,CAAC,GAAW,EAAE,KAAc;QAC7B,IAAI,KAAK,EAAE,CAAC;YACV,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QAEzB,CAAC;IACH,CAAC;IACD,MAAM,CAAC,GAAW;QAEhB,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAGxB,CAAC;;AAlFH,wCAmFC;;AAlFQ,mBAAI,GAAG,IAAI,6BAAW,EAAkB,AAApC,CAAqC"}
|
package/ts/cjs/sys-env.test.js
CHANGED
@@ -14,7 +14,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
14
14
|
const cement_1 = require("@adviser/cement");
|
15
15
|
const cf_env_actions_js_1 = require("./cf/cf-env-actions.js");
|
16
16
|
const web_env_actions_js_1 = require("./web/web-env-actions.js");
|
17
|
-
const node_env_actions_js_1 = require("./node/node-env-actions.js");
|
18
17
|
describe("sys_env", () => {
|
19
18
|
let key;
|
20
19
|
const envImpl = (0, cement_1.envFactory)();
|
@@ -182,45 +181,21 @@ describe("sys_env", () => {
|
|
182
181
|
expect(envImpl.get("key7")).toBe("value7");
|
183
182
|
expect(envImpl.get("key8")).toBe("value8");
|
184
183
|
});
|
185
|
-
|
186
|
-
|
187
|
-
|
188
|
-
|
189
|
-
|
190
|
-
|
191
|
-
|
192
|
-
|
193
|
-
|
194
|
-
|
195
|
-
|
196
|
-
|
197
|
-
|
198
|
-
|
199
|
-
|
200
|
-
GURKE_GURKE: "gurke-gurke",
|
201
|
-
},
|
202
|
-
},
|
203
|
-
};
|
204
|
-
node_env_actions_js_1.NodeEnvActions.once.reset();
|
205
|
-
const env = (0, cement_1.envFactory)({
|
206
|
-
symbol: "this-is-a-test",
|
207
|
-
id: "this-is-a-test-id",
|
208
|
-
});
|
209
|
-
const ret = env.gets("HELLO", "VITE_HELLO", "GURKE_HELLO", "VITE_SOME", "GURKE_SOME", "SOME", "VITE", "GURKE", "VITE_VITE", "GURKE_GURKE");
|
210
|
-
expect(ret.isOk()).toBeTruthy();
|
211
|
-
expect(ret.unwrap()).toEqual({
|
212
|
-
HELLO: "world",
|
213
|
-
VITE_HELLO: "vite-world",
|
214
|
-
GURKE_HELLO: "gurke-world",
|
215
|
-
VITE_SOME: "vite-some",
|
216
|
-
GURKE_SOME: "gurke-some",
|
217
|
-
SOME: "vite-some",
|
218
|
-
VITE: "vite-vite",
|
219
|
-
VITE_VITE: "vite-vite",
|
220
|
-
GURKE: "gurke-gurke",
|
221
|
-
GURKE_GURKE: "gurke-gurke",
|
222
|
-
});
|
223
|
-
});
|
184
|
+
it("set into provider", () => {
|
185
|
+
const key = `ENV-${Math.random()}`;
|
186
|
+
envImpl.set(key, "value");
|
187
|
+
expect(envImpl.get(key)).toBe("value");
|
188
|
+
if ((0, cement_1.runtimeFn)().isNodeIsh) {
|
189
|
+
expect(process.env[key]).toBe("value");
|
190
|
+
}
|
191
|
+
envImpl.delete(key);
|
192
|
+
expect(envImpl.get(key)).toBeUndefined();
|
193
|
+
if ((0, cement_1.runtimeFn)().isNodeIsh) {
|
194
|
+
expect(process.env[key]).toBeUndefined();
|
195
|
+
}
|
196
|
+
if ((0, cement_1.runtimeFn)().isDeno) {
|
197
|
+
expect(Deno.env.get(key)).toBeUndefined();
|
198
|
+
}
|
224
199
|
});
|
225
|
-
}
|
200
|
+
});
|
226
201
|
//# sourceMappingURL=sys-env.test.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"sys-env.test.js","sourceRoot":"","sources":["../../../src/sys-env.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,4CAA4H;AAC5H,8DAAsD;AACtD,iEAA6D;
|
1
|
+
{"version":3,"file":"sys-env.test.js","sourceRoot":"","sources":["../../../src/sys-env.test.ts"],"names":[],"mappings":"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"}
|
@@ -1,19 +1,8 @@
|
|
1
1
|
import { ResolveOnce } from "../resolve-once.js";
|
2
2
|
import { Env, EnvActions, EnvFactoryOpts } from "../sys-env.js";
|
3
|
-
export interface ImportMetaEnv {
|
4
|
-
import?: {
|
5
|
-
meta?: {
|
6
|
-
env?: Record<string, string>;
|
7
|
-
};
|
8
|
-
};
|
9
|
-
}
|
10
3
|
export declare class NodeEnvActions implements EnvActions {
|
11
4
|
#private;
|
12
5
|
static once: ResolveOnce<NodeEnvActions, void>;
|
13
|
-
static cleanPrefixes: string[];
|
14
|
-
static addCleanPrefix(prefix: string): void;
|
15
|
-
cleanImportMetaEnv(): Record<string, string>;
|
16
|
-
mergeEnv(): Record<string, string>;
|
17
6
|
static new(opts: Partial<EnvFactoryOpts>): EnvActions;
|
18
7
|
readonly opts: Partial<EnvFactoryOpts>;
|
19
8
|
private constructor();
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"node-env-actions.d.ts","sourceRoot":"","sources":["../../../../src/node/node-env-actions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,OAAO,EAAE,GAAG,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;
|
1
|
+
{"version":3,"file":"node-env-actions.d.ts","sourceRoot":"","sources":["../../../../src/node/node-env-actions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,OAAO,EAAE,GAAG,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAShE,qBAAa,cAAe,YAAW,UAAU;;IAC/C,MAAM,CAAC,IAAI,oCAAqC;IA2ChD,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG,UAAU;IAIrD,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;IACvC,OAAO;IAIP,QAAQ,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG;IAOvB,MAAM,IAAI,OAAO;IAIjB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAA+C;IACpF,IAAI,IAAI,MAAM,EAAE;IAGhB,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAGpC,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI;IAMtC,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;CAM1B"}
|
@@ -2,41 +2,7 @@ import { ResolveOnce } from "../resolve-once.js";
|
|
2
2
|
import { runtimeFn } from "../runtime.js";
|
3
3
|
export class NodeEnvActions {
|
4
4
|
static once = new ResolveOnce();
|
5
|
-
static cleanPrefixes = ["VITE_"];
|
6
|
-
static addCleanPrefix(prefix) {
|
7
|
-
if (!prefix.endsWith("_")) {
|
8
|
-
prefix += "_";
|
9
|
-
}
|
10
|
-
if (!NodeEnvActions.cleanPrefixes.includes(prefix)) {
|
11
|
-
NodeEnvActions.cleanPrefixes.push(prefix);
|
12
|
-
}
|
13
|
-
}
|
14
5
|
#node = globalThis;
|
15
|
-
#importMetaEnv = globalThis;
|
16
|
-
cleanImportMetaEnv() {
|
17
|
-
const metaEnv = this.#importMetaEnv.import?.meta?.env || {};
|
18
|
-
const cleaned = {};
|
19
|
-
for (const key of Object.keys(metaEnv)) {
|
20
|
-
const hasCleanPrefix = NodeEnvActions.cleanPrefixes.find((prefix) => key.startsWith(prefix));
|
21
|
-
if (hasCleanPrefix) {
|
22
|
-
const cleanedPrefix = key.replace(hasCleanPrefix, "");
|
23
|
-
const foundCleanPrefix = cleaned[cleanedPrefix];
|
24
|
-
if (!foundCleanPrefix) {
|
25
|
-
cleaned[cleanedPrefix] = metaEnv[key];
|
26
|
-
}
|
27
|
-
}
|
28
|
-
cleaned[key] = metaEnv[key];
|
29
|
-
}
|
30
|
-
return cleaned;
|
31
|
-
}
|
32
|
-
mergeEnv() {
|
33
|
-
const importMetaEnv = this.cleanImportMetaEnv();
|
34
|
-
const nodeEnv = Object.keys(this.#node.process.env).reduce((acc, key) => {
|
35
|
-
acc[key] = this.#node.process.env[key] || "";
|
36
|
-
return acc;
|
37
|
-
}, {});
|
38
|
-
return { ...importMetaEnv, ...nodeEnv };
|
39
|
-
}
|
40
6
|
static new(opts) {
|
41
7
|
return NodeEnvActions.once.once(() => new NodeEnvActions(opts));
|
42
8
|
}
|
@@ -53,7 +19,7 @@ export class NodeEnvActions {
|
|
53
19
|
active() {
|
54
20
|
return runtimeFn().isNodeIsh;
|
55
21
|
}
|
56
|
-
_env = this.active() ? this.
|
22
|
+
_env = this.active() ? this.#node.process.env : {};
|
57
23
|
keys() {
|
58
24
|
return Object.keys(this._env);
|
59
25
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"node-env-actions.js","sourceRoot":"","sources":["../../../../src/node/node-env-actions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAU1C,MAAM,OAAO,cAAc;IACzB,MAAM,CAAC,IAAI,GAAG,IAAI,WAAW,EAAkB,CAAC;
|
1
|
+
{"version":3,"file":"node-env-actions.js","sourceRoot":"","sources":["../../../../src/node/node-env-actions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAU1C,MAAM,OAAO,cAAc;IACzB,MAAM,CAAC,IAAI,GAAG,IAAI,WAAW,EAAkB,CAAC;IAUvC,KAAK,GAAG,UAAqE,CAAC;IAiCvF,MAAM,CAAC,GAAG,CAAC,IAA6B;QACtC,OAAO,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC;IAClE,CAAC;IAEQ,IAAI,CAA0B;IACvC,YAAoB,IAA6B;QAC/C,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAED,QAAQ,CAAC,GAAQ;QACf,KAAK,MAAM,GAAG,IAAI,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC;YAC7B,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;QACtC,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAED,MAAM;QACJ,OAAO,SAAS,EAAE,CAAC,SAAS,CAAC;IAE/B,CAAC;IACQ,IAAI,GAA2B,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;IACpF,IAAI;QACF,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC;IACD,GAAG,CAAC,GAAW;QACb,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACxB,CAAC;IACD,GAAG,CAAC,GAAW,EAAE,KAAc;QAC7B,IAAI,KAAK,EAAE,CAAC;YACV,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QAEzB,CAAC;IACH,CAAC;IACD,MAAM,CAAC,GAAW;QAEhB,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAGxB,CAAC"}
|
package/ts/esm/sys-env.test.js
CHANGED
@@ -1,7 +1,6 @@
|
|
1
1
|
import { EnvImpl, envFactory, registerEnvAction, runtimeFn, param } from "@adviser/cement";
|
2
2
|
import { CFEnvActions } from "./cf/cf-env-actions.js";
|
3
3
|
import { BrowserEnvActions } from "./web/web-env-actions.js";
|
4
|
-
import { NodeEnvActions } from "./node/node-env-actions.js";
|
5
4
|
describe("sys_env", () => {
|
6
5
|
let key;
|
7
6
|
const envImpl = envFactory();
|
@@ -167,45 +166,21 @@ describe("sys_env", () => {
|
|
167
166
|
expect(envImpl.get("key7")).toBe("value7");
|
168
167
|
expect(envImpl.get("key8")).toBe("value8");
|
169
168
|
});
|
170
|
-
|
171
|
-
|
172
|
-
|
173
|
-
|
174
|
-
|
175
|
-
|
176
|
-
|
177
|
-
|
178
|
-
|
179
|
-
|
180
|
-
|
181
|
-
|
182
|
-
|
183
|
-
|
184
|
-
|
185
|
-
GURKE_GURKE: "gurke-gurke",
|
186
|
-
},
|
187
|
-
},
|
188
|
-
};
|
189
|
-
NodeEnvActions.once.reset();
|
190
|
-
const env = envFactory({
|
191
|
-
symbol: "this-is-a-test",
|
192
|
-
id: "this-is-a-test-id",
|
193
|
-
});
|
194
|
-
const ret = env.gets("HELLO", "VITE_HELLO", "GURKE_HELLO", "VITE_SOME", "GURKE_SOME", "SOME", "VITE", "GURKE", "VITE_VITE", "GURKE_GURKE");
|
195
|
-
expect(ret.isOk()).toBeTruthy();
|
196
|
-
expect(ret.unwrap()).toEqual({
|
197
|
-
HELLO: "world",
|
198
|
-
VITE_HELLO: "vite-world",
|
199
|
-
GURKE_HELLO: "gurke-world",
|
200
|
-
VITE_SOME: "vite-some",
|
201
|
-
GURKE_SOME: "gurke-some",
|
202
|
-
SOME: "vite-some",
|
203
|
-
VITE: "vite-vite",
|
204
|
-
VITE_VITE: "vite-vite",
|
205
|
-
GURKE: "gurke-gurke",
|
206
|
-
GURKE_GURKE: "gurke-gurke",
|
207
|
-
});
|
208
|
-
});
|
169
|
+
it("set into provider", () => {
|
170
|
+
const key = `ENV-${Math.random()}`;
|
171
|
+
envImpl.set(key, "value");
|
172
|
+
expect(envImpl.get(key)).toBe("value");
|
173
|
+
if (runtimeFn().isNodeIsh) {
|
174
|
+
expect(process.env[key]).toBe("value");
|
175
|
+
}
|
176
|
+
envImpl.delete(key);
|
177
|
+
expect(envImpl.get(key)).toBeUndefined();
|
178
|
+
if (runtimeFn().isNodeIsh) {
|
179
|
+
expect(process.env[key]).toBeUndefined();
|
180
|
+
}
|
181
|
+
if (runtimeFn().isDeno) {
|
182
|
+
expect(Deno.env.get(key)).toBeUndefined();
|
183
|
+
}
|
209
184
|
});
|
210
|
-
}
|
185
|
+
});
|
211
186
|
//# sourceMappingURL=sys-env.test.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"sys-env.test.js","sourceRoot":"","sources":["../../../src/sys-env.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmC,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAC5H,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;
|
1
|
+
{"version":3,"file":"sys-env.test.js","sourceRoot":"","sources":["../../../src/sys-env.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmC,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAC5H,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE7D,QAAQ,CAAC,SAAS,EAAE,GAAG,EAAE;IACvB,IAAI,GAAW,CAAC;IAChB,MAAM,OAAO,GAAG,UAAU,EAAE,CAAC;IAC7B,UAAU,CAAC,GAAG,EAAE;QACd,GAAG,GAAG,OAAO,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC;IAC/B,CAAC,CAAC,CAAC;IACH,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE;QACjB,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC;QACzC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAC1B,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACvC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACjB,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACvC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACpB,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC;IAC3C,CAAC,CAAC,CAAC;IACH,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;QAChB,MAAM,GAAG,GAAG,IAAI,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;YACjD,SAAS,EAAE,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC;SACrC,CAAC,CAAC;QACH,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACnC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAChB,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC;IACvC,CAAC,CAAC,CAAC;IACH,EAAE,CAAC,iBAAiB,EAAE,GAAG,EAAE;QACzB,MAAM,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;QACnB,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAClB,MAAM,CAAC,EAAE,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,CAAC;QAElD,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;QAE7E,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,CACnD,OAAO;aACJ,IAAI,EAAE;aACN,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;aAC1B,IAAI,EAAE,CACV,CAAC;IACJ,CAAC,CAAC,CAAC;IACH,EAAE,CAAC,cAAc,EAAE,GAAG,EAAE;QACtB,MAAM,GAAG,GAAG,IAAI,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;YACjD,SAAS,EAAE,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC;SACrC,CAAC,CAAC;QACH,MAAM,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;QACnB,GAAG,CAAC,KAAK,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;QACnB,MAAM,CAAC,EAAE,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;QAC9B,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC;QACjD,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QACvB,MAAM,CAAC,EAAE,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;QAC9B,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC;QAClD,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAChB,MAAM,CAAC,EAAE,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;QAC9B,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC,CAAC;IACrD,CAAC,CAAC,CAAC;IACH,EAAE,CAAC,eAAe,EAAE,GAAG,EAAE;QACvB,MAAM,cAAc;YACT,IAAI,CAAsB;YAEnC,YAAY,IAA6B;gBACvC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,SAAS,IAAI,IAAI,GAAG,EAAkB,CAAC;YAC1D,CAAC;YAED,QAAQ,CAAC,GAAQ;gBACf,OAAO,GAAG,CAAC;YACb,CAAC;YAED,MAAM;gBACJ,OAAO,IAAI,CAAC;YACd,CAAC;YACD,IAAI;gBACF,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YACtC,CAAC;YACD,GAAG,CAAC,GAAW;gBACb,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAC5B,CAAC;YACD,GAAG,CAAC,GAAW,EAAE,KAAc;gBAC7B,IAAI,KAAK,EAAE,CAAC;oBACV,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;gBAC5B,CAAC;YACH,CAAC;YACD,MAAM,CAAC,GAAW;gBAChB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACxB,CAAC;SACF;QACD,IAAI,GAAG,GAAmB,EAAoB,CAAC;QAC/C,MAAM,KAAK,GAAG,iBAAiB,CAAC,CAAC,IAAI,EAAE,EAAE;YACvC,GAAG,GAAG,IAAI,cAAc,CAAC,IAAI,CAAC,CAAC;YAC/B,OAAO,GAAG,CAAC;QACb,CAAC,CAAC,CAAC;QACH,MAAM,GAAG,GAAG,UAAU,CAAC;YACrB,SAAS,EAAE,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC;SACrC,CAAC,CAAC;QACH,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACnC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACnC,KAAK,EAAE,CAAC;IACV,CAAC,CAAC,CAAC;IACH,IAAI,SAAS,EAAE,CAAC,UAAU,EAAE,CAAC;QAC3B,EAAE,CAAC,cAAc,EAAE,GAAG,EAAE;YACtB,MAAM,GAAG,GAAG,UAAU,EAAE,CAAC;YACzB,MAAM,KAAK,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;YACtB,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAEjB,YAAY,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC;YAE9C,GAAG,CAAC,GAAG,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;YAElC,MAAM,CAAC,KAAK,CAAC,CAAC,cAAc,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;YACnD,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC7C,CAAC,CAAC,CAAC;IACL,CAAC;IACD,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE;QACjB,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;QACnD,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,UAAU,EAAE,CAAC;QAClC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAC5B,MAAM,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;QAClD,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,UAAU,EAAE,CAAC;QAChC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC;IACjD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,YAAY,EAAE,GAAG,EAAE;QACpB,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAC5B,MAAM,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;YACvB,IAAI,EAAE,KAAK,CAAC,QAAQ;YACpB,IAAI,EAAE,KAAK,CAAC,QAAQ;YACpB,GAAG,EAAE,KAAK,CAAC,QAAQ;SACpB,CAAC,CAAC;QACH,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,UAAU,EAAE,CAAC;QACjC,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,+BAA+B,CAAC,CAAC;IACrE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uBAAuB,EAAE,GAAG,EAAE;QAC/B,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;QACrD,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC3C,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;IACH,EAAE,CAAC,wBAAwB,EAAE,GAAG,EAAE;QAChC,OAAO,CAAC,IAAI,CAAC;YACX,CAAC,MAAM,EAAE,QAAQ,CAAC;YAClB,CAAC,MAAM,EAAE,QAAQ,CAAC;SACnB,CAAC,CAAC;QACH,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC3C,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,aAAa,EAAE,GAAG,EAAE;QACrB,OAAO,CAAC,IAAI,CAAC;YACX,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,QAAQ;SACf,CAAC,CAAC;QACH,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC3C,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,eAAe,EAAE,GAAG,EAAE;QACvB,OAAO,CAAC,IAAI,CACV,IAAI,GAAG,CACL,MAAM,CAAC,OAAO,CAAC;YACb,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,QAAQ;SACf,CAAC,CACH,CAAC,OAAO,EAAE,CACZ,CAAC;QACF,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC3C,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kBAAkB,EAAE,GAAG,EAAE;QAC1B,OAAO,CAAC,IAAI,CACV,IAAI,GAAG,CACL,MAAM,CAAC,OAAO,CAAC;YACb,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,QAAQ;SACf,CAAC,CACH,CAAC,OAAO,EAAE,EACX;YACE,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,QAAQ;SACf,EACD,CAAC,MAAM,EAAE,QAAQ,CAAC,EAClB,CAAC,MAAM,EAAE,QAAQ,CAAC,EAClB;YACE,CAAC,MAAM,EAAE,QAAQ,CAAC;YAClB,CAAC,MAAM,EAAE,QAAQ,CAAC;SACnB,CACF,CAAC;QACF,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC3C,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC3C,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC3C,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC3C,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC3C,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC3C,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC3C,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mBAAmB,EAAE,GAAG,EAAE;QAC3B,MAAM,GAAG,GAAG,OAAO,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC;QACnC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAC1B,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACvC,IAAI,SAAS,EAAE,CAAC,SAAS,EAAE,CAAC;YAC1B,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACzC,CAAC;QACD,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACpB,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC;QACzC,IAAI,SAAS,EAAE,CAAC,SAAS,EAAE,CAAC;YAC1B,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC;QAC3C,CAAC;QACD,IAAI,SAAS,EAAE,CAAC,MAAM,EAAE,CAAC;YAEvB,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC;QAC5C,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|