dequanto 0.1.25 → 0.1.26
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/lib/cjs/config/ConfigProvider.js +18 -3
- package/lib/cjs/config/ConfigProvider.js.map +1 -1
- package/lib/cjs/utils/$dependency.js +0 -29
- package/lib/cjs/utils/$dependency.js.map +1 -1
- package/lib/esm/config/ConfigProvider.js.map +1 -1
- package/lib/esm/config/ConfigProvider.mjs +18 -3
- package/lib/esm/utils/$dependency.js.map +1 -1
- package/lib/esm/utils/$dependency.mjs +0 -4
- package/lib/types/config/AConfigBase.d.ts +1 -0
- package/package-bundler.json +0 -2
- package/package.json +2 -1
- package/src/config/AConfigBase.ts +1 -0
- package/src/config/ConfigProvider.ts +20 -3
|
@@ -10,6 +10,16 @@ const _secret_1 = require("../utils/$secret.js");
|
|
|
10
10
|
const _require_1 = require("../utils/$require.js");
|
|
11
11
|
const _const_1 = require("../utils/$const.js");
|
|
12
12
|
const ConfigDefaults_1 = require("./ConfigDefaults.js");
|
|
13
|
+
const DEFAULT_PATHS = {
|
|
14
|
+
ACCOUNTS: {
|
|
15
|
+
local: `./0xc/config/accounts.json`,
|
|
16
|
+
global: `%APPDATA%/.dequanto/accounts.json`
|
|
17
|
+
},
|
|
18
|
+
CONFIG: {
|
|
19
|
+
local: `./0xc/config/config.yml`,
|
|
20
|
+
global: `%APPDATA%/.dequanto/config.yml`
|
|
21
|
+
}
|
|
22
|
+
};
|
|
13
23
|
class ConfigProvider {
|
|
14
24
|
async fetch(parameters) {
|
|
15
25
|
let sources = _const_1.is_BROWSER
|
|
@@ -29,9 +39,13 @@ class ConfigProvider {
|
|
|
29
39
|
await this.config.$write(json);
|
|
30
40
|
}
|
|
31
41
|
async getSourcesNode(parameters) {
|
|
42
|
+
let isLocal = parameters?.isLocal ?? false;
|
|
43
|
+
let PATH_KEY = isLocal ? 'local' : 'global';
|
|
32
44
|
let unlockedAccountsKey = await _secret_1.$secret.getPin(parameters);
|
|
33
|
-
let configPathAccounts = _cli_1.$cli.getParamValue('config-accounts', parameters)
|
|
34
|
-
|
|
45
|
+
let configPathAccounts = _cli_1.$cli.getParamValue('config-accounts', parameters)
|
|
46
|
+
?? DEFAULT_PATHS.ACCOUNTS[PATH_KEY];
|
|
47
|
+
let configPathMain = _cli_1.$cli.getParamValue('config-global', parameters)
|
|
48
|
+
?? DEFAULT_PATHS.CONFIG[PATH_KEY];
|
|
35
49
|
return [
|
|
36
50
|
{
|
|
37
51
|
config: {
|
|
@@ -45,7 +59,8 @@ class ConfigProvider {
|
|
|
45
59
|
optional: true,
|
|
46
60
|
},
|
|
47
61
|
{
|
|
48
|
-
|
|
62
|
+
name: 'main',
|
|
63
|
+
path: configPathMain,
|
|
49
64
|
writable: true,
|
|
50
65
|
optional: true,
|
|
51
66
|
extendArrays: false,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConfigProvider.js","sourceRoot":"","sources":["../../../src/config/ConfigProvider.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA8B;AAK9B,wCAAqC;AACrC,8CAA2C;AAC3C,uDAAoD;AACpD,mDAAoD;AACpD,qDAAkD;
|
|
1
|
+
{"version":3,"file":"ConfigProvider.js","sourceRoot":"","sources":["../../../src/config/ConfigProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,43 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
/** ESM and CJS Loader */
|
|
3
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
4
|
-
if (k2 === undefined) k2 = k;
|
|
5
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
6
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
7
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
8
|
-
}
|
|
9
|
-
Object.defineProperty(o, k2, desc);
|
|
10
|
-
}) : (function(o, m, k, k2) {
|
|
11
|
-
if (k2 === undefined) k2 = k;
|
|
12
|
-
o[k2] = m[k];
|
|
13
|
-
}));
|
|
14
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
15
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
16
|
-
}) : function(o, v) {
|
|
17
|
-
o["default"] = v;
|
|
18
|
-
});
|
|
19
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
20
|
-
if (mod && mod.__esModule) return mod;
|
|
21
|
-
var result = {};
|
|
22
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
23
|
-
__setModuleDefault(result, mod);
|
|
24
|
-
return result;
|
|
25
|
-
};
|
|
26
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
27
4
|
exports.$dependency = void 0;
|
|
28
5
|
var $dependency;
|
|
29
6
|
(function ($dependency) {
|
|
30
7
|
async function load(name) {
|
|
31
|
-
var _a;
|
|
32
8
|
//#if (CJS)
|
|
33
9
|
const r = require;
|
|
34
10
|
return Promise.resolve(require(name));
|
|
35
11
|
//#endif
|
|
36
|
-
//#if (ESM)
|
|
37
|
-
// @ts-ignore: Conditional import
|
|
38
|
-
const exp = await (_a = name, Promise.resolve().then(() => __importStar(require(_a))));
|
|
39
|
-
return exp;
|
|
40
|
-
//#endif
|
|
41
12
|
}
|
|
42
13
|
$dependency.load = load;
|
|
43
14
|
})($dependency = exports.$dependency || (exports.$dependency = {}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"$dependency.js","sourceRoot":"","sources":["../../../src/utils/$dependency.ts"],"names":[],"mappings":";AAAA,yBAAyB
|
|
1
|
+
{"version":3,"file":"$dependency.js","sourceRoot":"","sources":["../../../src/utils/$dependency.ts"],"names":[],"mappings":";AAAA,yBAAyB;;;AAEzB,IAAiB,WAAW,CAW3B;AAXD,WAAiB,WAAW;IAEjB,KAAK,UAAU,IAAI,CAAW,IAAY;QAC7C,WAAW;QACX,MAAM,CAAC,GAAG,OAAO,CAAC;QAClB,OAAO,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QACtC,QAAQ;IAGZ,CAAC;IAPqB,gBAAI,OAOzB,CAAA;AAEL,CAAC,EAXgB,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAW3B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConfigProvider.js","sourceRoot":"","sources":["../../../src/config/ConfigProvider.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA8B;AAK9B,wCAAqC;AACrC,8CAA2C;AAC3C,uDAAoD;AACpD,mDAAoD;AACpD,qDAAkD;
|
|
1
|
+
{"version":3,"file":"ConfigProvider.js","sourceRoot":"","sources":["../../../src/config/ConfigProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,16 @@ import { $secret } from '../utils/$secret.mjs';
|
|
|
4
4
|
import { $require } from '../utils/$require.mjs';
|
|
5
5
|
import { is_BROWSER } from '../utils/$const.mjs';
|
|
6
6
|
import { ConfigDefaults } from './ConfigDefaults.mjs';
|
|
7
|
+
const DEFAULT_PATHS = {
|
|
8
|
+
ACCOUNTS: {
|
|
9
|
+
local: `./0xc/config/accounts.json`,
|
|
10
|
+
global: `%APPDATA%/.dequanto/accounts.json`
|
|
11
|
+
},
|
|
12
|
+
CONFIG: {
|
|
13
|
+
local: `./0xc/config/config.yml`,
|
|
14
|
+
global: `%APPDATA%/.dequanto/config.yml`
|
|
15
|
+
}
|
|
16
|
+
};
|
|
7
17
|
export class ConfigProvider {
|
|
8
18
|
async fetch(parameters) {
|
|
9
19
|
let sources = is_BROWSER
|
|
@@ -23,9 +33,13 @@ export class ConfigProvider {
|
|
|
23
33
|
await this.config.$write(json);
|
|
24
34
|
}
|
|
25
35
|
async getSourcesNode(parameters) {
|
|
36
|
+
let isLocal = parameters?.isLocal ?? false;
|
|
37
|
+
let PATH_KEY = isLocal ? 'local' : 'global';
|
|
26
38
|
let unlockedAccountsKey = await $secret.getPin(parameters);
|
|
27
|
-
let configPathAccounts = $cli.getParamValue('config-accounts', parameters)
|
|
28
|
-
|
|
39
|
+
let configPathAccounts = $cli.getParamValue('config-accounts', parameters)
|
|
40
|
+
?? DEFAULT_PATHS.ACCOUNTS[PATH_KEY];
|
|
41
|
+
let configPathMain = $cli.getParamValue('config-global', parameters)
|
|
42
|
+
?? DEFAULT_PATHS.CONFIG[PATH_KEY];
|
|
29
43
|
return [
|
|
30
44
|
{
|
|
31
45
|
config: {
|
|
@@ -39,7 +53,8 @@ export class ConfigProvider {
|
|
|
39
53
|
optional: true,
|
|
40
54
|
},
|
|
41
55
|
{
|
|
42
|
-
|
|
56
|
+
name: 'main',
|
|
57
|
+
path: configPathMain,
|
|
43
58
|
writable: true,
|
|
44
59
|
optional: true,
|
|
45
60
|
extendArrays: false,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"$dependency.js","sourceRoot":"","sources":["../../../src/utils/$dependency.ts"],"names":[],"mappings":";AAAA,yBAAyB
|
|
1
|
+
{"version":3,"file":"$dependency.js","sourceRoot":"","sources":["../../../src/utils/$dependency.ts"],"names":[],"mappings":";AAAA,yBAAyB;;;AAEzB,IAAiB,WAAW,CAW3B;AAXD,WAAiB,WAAW;IAEjB,KAAK,UAAU,IAAI,CAAW,IAAY;QAC7C,WAAW;QACX,MAAM,CAAC,GAAG,OAAO,CAAC;QAClB,OAAO,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QACtC,QAAQ;IAGZ,CAAC;IAPqB,gBAAI,OAOzB,CAAA;AAEL,CAAC,EAXgB,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAW3B"}
|
|
@@ -7,6 +7,7 @@ export type TConfigParamsNode = TConfigParamsBase & {
|
|
|
7
7
|
pin?: string;
|
|
8
8
|
configAccounts?: string;
|
|
9
9
|
configGlobal?: string;
|
|
10
|
+
isLocal?: boolean;
|
|
10
11
|
};
|
|
11
12
|
export type TConfigParamsBrowser = TConfigParamsBase & {};
|
|
12
13
|
export type TConfigParams = TConfigParamsNode | TConfigParamsBrowser;
|
package/package-bundler.json
CHANGED
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
"apps": {
|
|
3
3
|
"cjs": {
|
|
4
4
|
"file": "**.ts",
|
|
5
|
-
"//file": "blocks/**.ts",
|
|
6
5
|
"ignore": [
|
|
7
6
|
"bridges/.+",
|
|
8
7
|
"config/dequanto.d.ts",
|
|
@@ -59,7 +58,6 @@
|
|
|
59
58
|
},
|
|
60
59
|
"esm": {
|
|
61
60
|
"file": "**.ts",
|
|
62
|
-
"//file": "blocks/**.ts",
|
|
63
61
|
"ignore": [
|
|
64
62
|
"bridges/.+",
|
|
65
63
|
"config/dequanto.d.ts",
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "dequanto",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.26",
|
|
4
4
|
"author": {
|
|
5
5
|
"name": "Alex Kit",
|
|
6
6
|
"email": "alex.kit@atmajs.com"
|
|
@@ -41,6 +41,7 @@
|
|
|
41
41
|
"app-bundler": "^0.2.13",
|
|
42
42
|
"atma": "^0.15.22",
|
|
43
43
|
"atma-io-middleware-base": "^1.0.51",
|
|
44
|
+
"atma-io-middleware-condcomments": "^1.2.8",
|
|
44
45
|
"atma-io-middleware-importer": "^1.1.38",
|
|
45
46
|
"atma-io-middleware-uglify": "^1.1.25",
|
|
46
47
|
"atma-loader-ts": "^1.2.6",
|
|
@@ -9,6 +9,17 @@ import { $require } from '@dequanto/utils/$require';
|
|
|
9
9
|
import { is_BROWSER } from '@dequanto/utils/$const';
|
|
10
10
|
import { ConfigDefaults } from './ConfigDefaults';
|
|
11
11
|
|
|
12
|
+
const DEFAULT_PATHS = {
|
|
13
|
+
ACCOUNTS: {
|
|
14
|
+
local: `./0xc/config/accounts.json`,
|
|
15
|
+
global: `%APPDATA%/.dequanto/accounts.json`
|
|
16
|
+
},
|
|
17
|
+
CONFIG: {
|
|
18
|
+
local: `./0xc/config/config.yml`,
|
|
19
|
+
global: `%APPDATA%/.dequanto/config.yml`
|
|
20
|
+
}
|
|
21
|
+
};
|
|
22
|
+
|
|
12
23
|
|
|
13
24
|
export class ConfigProvider implements IConfigProvider {
|
|
14
25
|
|
|
@@ -39,9 +50,14 @@ export class ConfigProvider implements IConfigProvider {
|
|
|
39
50
|
|
|
40
51
|
|
|
41
52
|
private async getSourcesNode (parameters: TConfigParamsNode) {
|
|
53
|
+
let isLocal = parameters?.isLocal ?? false;
|
|
54
|
+
let PATH_KEY: 'local' | 'global' = isLocal ? 'local' : 'global';
|
|
55
|
+
|
|
42
56
|
let unlockedAccountsKey = await $secret.getPin(parameters);
|
|
43
|
-
let configPathAccounts = $cli.getParamValue('config-accounts', parameters)
|
|
44
|
-
|
|
57
|
+
let configPathAccounts = $cli.getParamValue('config-accounts', parameters)
|
|
58
|
+
?? DEFAULT_PATHS.ACCOUNTS[ PATH_KEY ];
|
|
59
|
+
let configPathMain = $cli.getParamValue('config-global', parameters)
|
|
60
|
+
?? DEFAULT_PATHS.CONFIG[ PATH_KEY ];
|
|
45
61
|
|
|
46
62
|
return [
|
|
47
63
|
{
|
|
@@ -56,7 +72,8 @@ export class ConfigProvider implements IConfigProvider {
|
|
|
56
72
|
optional: true,
|
|
57
73
|
},
|
|
58
74
|
{
|
|
59
|
-
|
|
75
|
+
name: 'main',
|
|
76
|
+
path: configPathMain,
|
|
60
77
|
writable: true,
|
|
61
78
|
optional: true,
|
|
62
79
|
extendArrays: false,
|