@dcupl/cli 1.4.0-beta.16 → 1.4.0-beta.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/dist/cli.js +28 -37
- package/dist/cli.js.map +1 -1
- package/dist/functions/app/commands/data/render.d.ts +3 -1
- package/dist/functions/app/commands/data/render.js +9 -1
- package/dist/functions/app/commands/data/render.js.map +1 -1
- package/dist/functions/app/commands/loaders/remove.js +2 -0
- package/dist/functions/app/commands/loaders/remove.js.map +1 -1
- package/dist/functions/app/daemon/controllers/data.controller.d.ts +3 -4
- package/dist/functions/app/daemon/controllers/data.controller.js +2 -2
- package/dist/functions/app/daemon/controllers/data.controller.js.map +1 -1
- package/dist/functions/app/daemon/controllers/loaders.controller.js +1 -1
- package/dist/functions/app/daemon/controllers/loaders.controller.js.map +1 -1
- package/dist/functions/app/daemon/services/csv-delimiter.d.ts +15 -0
- package/dist/functions/app/daemon/services/csv-delimiter.js +99 -0
- package/dist/functions/app/daemon/services/csv-delimiter.js.map +1 -0
- package/dist/functions/app/daemon/services/dcupl-host.service.d.ts +14 -2
- package/dist/functions/app/daemon/services/dcupl-host.service.js +91 -9
- package/dist/functions/app/daemon/services/dcupl-host.service.js.map +1 -1
- package/dist/functions/app/daemon/services/ingest.service.d.ts +1 -0
- package/dist/functions/app/daemon/services/ingest.service.js +9 -7
- package/dist/functions/app/daemon/services/ingest.service.js.map +1 -1
- package/dist/functions/app/daemon/services/loaders.service.d.ts +1 -1
- package/dist/functions/app/daemon/services/loaders.service.js +7 -1
- package/dist/functions/app/daemon/services/loaders.service.js.map +1 -1
- package/dist/functions/app/daemon/services/staged-keys.d.ts +12 -0
- package/dist/functions/app/daemon/services/staged-keys.js +72 -0
- package/dist/functions/app/daemon/services/staged-keys.js.map +1 -0
- package/dist/functions/generate/files/generate-code.js +0 -1
- package/dist/functions/generate/files/generate-code.js.map +1 -1
- package/dist/functions/generate/files/generate-files.d.ts +1 -0
- package/dist/functions/generate/files/generate-files.js +18 -7
- package/dist/functions/generate/files/generate-files.js.map +1 -1
- package/dist/functions/generate/files/generate-schema.js +1 -1
- package/dist/functions/generate/files/generate-schema.js.map +1 -1
- package/dist/functions/generate/files/generate.helper.d.ts +6 -2
- package/dist/functions/generate/files/generate.helper.js +8 -6
- package/dist/functions/generate/files/generate.helper.js.map +1 -1
- package/dist/functions/generate/files/script-starters.d.ts +1 -0
- package/dist/functions/generate/files/script-starters.js +3 -2
- package/dist/functions/generate/files/script-starters.js.map +1 -1
- package/dist/functions/generate/files/workflow-presets.js +2 -1
- package/dist/functions/generate/files/workflow-presets.js.map +1 -1
- package/dist/functions/generate/model-from-data/generate-model-from-data.d.ts +1 -0
- package/dist/functions/generate/model-from-data/generate-model-from-data.js +64 -1
- package/dist/functions/generate/model-from-data/generate-model-from-data.js.map +1 -1
- package/dist/functions/helper/api-client.d.ts +1 -0
- package/dist/functions/helper/api-client.js +8 -2
- package/dist/functions/helper/api-client.js.map +1 -1
- package/dist/functions/helper/config.helper.js +1 -1
- package/dist/functions/helper/config.helper.js.map +1 -1
- package/dist/functions/schemas/examples/ResponseScriptConfig.example.json +1 -1
- package/dist/functions/schemas/resolve.d.ts +1 -0
- package/dist/functions/schemas/resolve.js +32 -1
- package/dist/functions/schemas/resolve.js.map +1 -1
- package/dist/functions/workflow/commands/run.d.ts +2 -8
- package/dist/functions/workflow/commands/run.js +5 -14
- package/dist/functions/workflow/commands/run.js.map +1 -1
- package/dist/functions/workflow/commands/test.d.ts +2 -8
- package/dist/functions/workflow/commands/test.js +5 -12
- package/dist/functions/workflow/commands/test.js.map +1 -1
- package/dist/functions/workflow/workflow-api.d.ts +7 -7
- package/dist/functions/workflow/workflow-api.js +28 -15
- package/dist/functions/workflow/workflow-api.js.map +1 -1
- package/package.json +5 -5
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loaders.controller.js","sourceRoot":"","sources":["../../../../../src/functions/app/daemon/controllers/loaders.controller.ts"],"names":[],"mappings":";;;;AAAA,2CAAuF;AACvF,iEAAyD;AACzD,uEAAgE;AAYzD,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAC5B,YAA6B,OAAuB;QAAvB,YAAO,GAAP,OAAO,CAAgB;IAAG,CAAC;IAGlD,AAAN,KAAK,CAAC,MAAM,CAAS,IAAsB;QACzC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC1C,OAAO,EAAE,EAAE,EAAE,IAAa,EAAE,IAAI,EAAE,CAAC;IACrC,CAAC;IAGK,AAAN,KAAK,CAAC,OAAO,CACG,GAAW,EACjB,IAAwB;QAEhC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,IAAI,EAAE,CAAC,CAAC;QACzD,OAAO,EAAE,EAAE,EAAE,IAAa,EAAE,IAAI,EAAE,CAAC;IACrC,CAAC;IAGK,AAAN,KAAK,CAAC,IAAI;QACR,OAAO,EAAE,EAAE,EAAE,IAAa,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC;IACvE,CAAC;IAGK,AAAN,KAAK,CAAC,MAAM,CAAe,GAAW;QACpC,OAAO,EAAE,EAAE,EAAE,IAAa,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;IAC5D,CAAC;IAGK,AAAN,KAAK,CAAC,MAAM,CAAe,GAAW;QACpC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"loaders.controller.js","sourceRoot":"","sources":["../../../../../src/functions/app/daemon/controllers/loaders.controller.ts"],"names":[],"mappings":";;;;AAAA,2CAAuF;AACvF,iEAAyD;AACzD,uEAAgE;AAYzD,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAC5B,YAA6B,OAAuB;QAAvB,YAAO,GAAP,OAAO,CAAgB;IAAG,CAAC;IAGlD,AAAN,KAAK,CAAC,MAAM,CAAS,IAAsB;QACzC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC1C,OAAO,EAAE,EAAE,EAAE,IAAa,EAAE,IAAI,EAAE,CAAC;IACrC,CAAC;IAGK,AAAN,KAAK,CAAC,OAAO,CACG,GAAW,EACjB,IAAwB;QAEhC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,IAAI,EAAE,CAAC,CAAC;QACzD,OAAO,EAAE,EAAE,EAAE,IAAa,EAAE,IAAI,EAAE,CAAC;IACrC,CAAC;IAGK,AAAN,KAAK,CAAC,IAAI;QACR,OAAO,EAAE,EAAE,EAAE,IAAa,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC;IACvE,CAAC;IAGK,AAAN,KAAK,CAAC,MAAM,CAAe,GAAW;QACpC,OAAO,EAAE,EAAE,EAAE,IAAa,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;IAC5D,CAAC;IAGK,AAAN,KAAK,CAAC,MAAM,CAAe,GAAW;QACpC,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC/B,OAAO,EAAE,EAAE,EAAE,IAAa,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,CAAC;IAC7D,CAAC;CACF,CAAA;AAjCY,8CAAiB;AAItB;IADL,IAAA,aAAI,GAAE;IACO,mBAAA,IAAA,aAAI,GAAE,CAAA;;;;+CAGnB;AAGK;IADL,IAAA,aAAI,EAAC,cAAc,CAAC;IAElB,mBAAA,IAAA,cAAK,EAAC,KAAK,CAAC,CAAA;IACZ,mBAAA,IAAA,aAAI,GAAE,CAAA;;;;gDAIR;AAGK;IADL,IAAA,YAAG,GAAE;;;;6CAGL;AAGK;IADL,IAAA,YAAG,EAAC,MAAM,CAAC;IACE,mBAAA,IAAA,cAAK,EAAC,KAAK,CAAC,CAAA;;;;+CAEzB;AAGK;IADL,IAAA,eAAM,EAAC,MAAM,CAAC;IACD,mBAAA,IAAA,cAAK,EAAC,KAAK,CAAC,CAAA;;;;+CAGzB;4BAhCU,iBAAiB;IAF7B,IAAA,mBAAU,EAAC,SAAS,CAAC;IACrB,IAAA,kBAAS,EAAC,8BAAW,CAAC;6CAEiB,mCAAc;GADzC,iBAAiB,CAiC7B"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
export declare const CSV_DELIMITER_CANDIDATES: readonly [",", ";", "\t", "|"];
|
|
2
|
+
export type CsvDelimiter = (typeof CSV_DELIMITER_CANDIDATES)[number];
|
|
3
|
+
export declare const CSV_DELIMITER_SAMPLE_RECORDS = 50;
|
|
4
|
+
export type CsvDelimiterDetection = {
|
|
5
|
+
delimiter: CsvDelimiter | undefined;
|
|
6
|
+
columns: number;
|
|
7
|
+
records: number;
|
|
8
|
+
consistency: number;
|
|
9
|
+
rowHint?: CsvDelimiter;
|
|
10
|
+
};
|
|
11
|
+
export declare const countColumns: (text: string, delimiter: string, maxRecords?: number) => number[];
|
|
12
|
+
export declare const detectCsvDelimiter: (text: string) => CsvDelimiterDetection;
|
|
13
|
+
export declare const parseDelimiterFlag: (value: string | undefined) => CsvDelimiter | undefined;
|
|
14
|
+
export declare const describeDelimiter: (delimiter: string) => string;
|
|
15
|
+
export declare const DELIMITER_FLAG_CHOICES = "',' ';' tab '|'";
|
|
@@ -0,0 +1,99 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.DELIMITER_FLAG_CHOICES = exports.describeDelimiter = exports.parseDelimiterFlag = exports.detectCsvDelimiter = exports.countColumns = exports.CSV_DELIMITER_SAMPLE_RECORDS = exports.CSV_DELIMITER_CANDIDATES = void 0;
|
|
4
|
+
exports.CSV_DELIMITER_CANDIDATES = [',', ';', '\t', '|'];
|
|
5
|
+
exports.CSV_DELIMITER_SAMPLE_RECORDS = 50;
|
|
6
|
+
const stripBom = (text) => (text.charCodeAt(0) === 0xfeff ? text.slice(1) : text);
|
|
7
|
+
const countColumns = (text, delimiter, maxRecords = exports.CSV_DELIMITER_SAMPLE_RECORDS) => {
|
|
8
|
+
const counts = [];
|
|
9
|
+
let fields = 1;
|
|
10
|
+
let hasContent = false;
|
|
11
|
+
let inQuotes = false;
|
|
12
|
+
const endRecord = () => {
|
|
13
|
+
if (hasContent)
|
|
14
|
+
counts.push(fields);
|
|
15
|
+
fields = 1;
|
|
16
|
+
hasContent = false;
|
|
17
|
+
};
|
|
18
|
+
for (let i = 0; i < text.length && counts.length < maxRecords; i++) {
|
|
19
|
+
const ch = text[i];
|
|
20
|
+
if (inQuotes) {
|
|
21
|
+
if (ch === '"') {
|
|
22
|
+
if (text[i + 1] === '"')
|
|
23
|
+
i++;
|
|
24
|
+
else
|
|
25
|
+
inQuotes = false;
|
|
26
|
+
}
|
|
27
|
+
continue;
|
|
28
|
+
}
|
|
29
|
+
if (ch === '"') {
|
|
30
|
+
inQuotes = true;
|
|
31
|
+
hasContent = true;
|
|
32
|
+
}
|
|
33
|
+
else if (ch === delimiter) {
|
|
34
|
+
fields++;
|
|
35
|
+
hasContent = true;
|
|
36
|
+
}
|
|
37
|
+
else if (ch === '\n') {
|
|
38
|
+
endRecord();
|
|
39
|
+
}
|
|
40
|
+
else if (ch !== '\r') {
|
|
41
|
+
hasContent = true;
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
if (counts.length < maxRecords)
|
|
45
|
+
endRecord();
|
|
46
|
+
return counts;
|
|
47
|
+
};
|
|
48
|
+
exports.countColumns = countColumns;
|
|
49
|
+
const detectCsvDelimiter = (text) => {
|
|
50
|
+
const sample = stripBom(text);
|
|
51
|
+
let best = { delimiter: undefined, columns: 1, consistency: 0, records: 0 };
|
|
52
|
+
let rowHint;
|
|
53
|
+
for (const candidate of exports.CSV_DELIMITER_CANDIDATES) {
|
|
54
|
+
const counts = (0, exports.countColumns)(sample, candidate);
|
|
55
|
+
best.records = counts.length;
|
|
56
|
+
if (counts.length === 0)
|
|
57
|
+
continue;
|
|
58
|
+
const columns = counts[0];
|
|
59
|
+
if (columns < 2) {
|
|
60
|
+
const occurrences = counts.slice(1).reduce((sum, c) => sum + (c - 1), 0);
|
|
61
|
+
if (occurrences > 0 && (!rowHint || occurrences > rowHint.occurrences)) {
|
|
62
|
+
rowHint = { delimiter: candidate, occurrences };
|
|
63
|
+
}
|
|
64
|
+
continue;
|
|
65
|
+
}
|
|
66
|
+
const consistency = counts.filter((c) => c === columns).length / counts.length;
|
|
67
|
+
const better = best.delimiter === undefined ||
|
|
68
|
+
consistency > best.consistency ||
|
|
69
|
+
(consistency === best.consistency && columns > best.columns);
|
|
70
|
+
if (better)
|
|
71
|
+
best = { delimiter: candidate, columns, consistency, records: counts.length };
|
|
72
|
+
}
|
|
73
|
+
if (best.delimiter === undefined && rowHint)
|
|
74
|
+
best.rowHint = rowHint.delimiter;
|
|
75
|
+
return best;
|
|
76
|
+
};
|
|
77
|
+
exports.detectCsvDelimiter = detectCsvDelimiter;
|
|
78
|
+
const DELIMITER_ALIASES = {
|
|
79
|
+
',': ',',
|
|
80
|
+
comma: ',',
|
|
81
|
+
';': ';',
|
|
82
|
+
semicolon: ';',
|
|
83
|
+
'\t': '\t',
|
|
84
|
+
'\\t': '\t',
|
|
85
|
+
tab: '\t',
|
|
86
|
+
'|': '|',
|
|
87
|
+
pipe: '|',
|
|
88
|
+
};
|
|
89
|
+
const parseDelimiterFlag = (value) => {
|
|
90
|
+
if (value === undefined)
|
|
91
|
+
return undefined;
|
|
92
|
+
const alias = (key) => Object.prototype.hasOwnProperty.call(DELIMITER_ALIASES, key) ? DELIMITER_ALIASES[key] : undefined;
|
|
93
|
+
return alias(value.trim().toLowerCase()) ?? alias(value);
|
|
94
|
+
};
|
|
95
|
+
exports.parseDelimiterFlag = parseDelimiterFlag;
|
|
96
|
+
const describeDelimiter = (delimiter) => (delimiter === '\t' ? 'tab' : `'${delimiter}'`);
|
|
97
|
+
exports.describeDelimiter = describeDelimiter;
|
|
98
|
+
exports.DELIMITER_FLAG_CHOICES = "',' ';' tab '|'";
|
|
99
|
+
//# sourceMappingURL=csv-delimiter.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"csv-delimiter.js","sourceRoot":"","sources":["../../../../../src/functions/app/daemon/services/csv-delimiter.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,10 +12,17 @@ export interface HostInitOptions {
|
|
|
12
12
|
}
|
|
13
13
|
export interface DataMutationHostOptions {
|
|
14
14
|
model: string;
|
|
15
|
-
keyProperty?: string;
|
|
15
|
+
keyProperty?: string | string[];
|
|
16
16
|
autoGenerateKey?: boolean;
|
|
17
17
|
autoGenerateProperties?: AutoGeneratePropertiesOption;
|
|
18
18
|
}
|
|
19
|
+
export declare function parseKeyProperty(keyProperty: string | string[] | undefined): string | string[] | undefined;
|
|
20
|
+
export declare const SKIPPED_KEYS_LIMIT = 20;
|
|
21
|
+
export interface DataUpdateResult {
|
|
22
|
+
updated: number;
|
|
23
|
+
skipped: number;
|
|
24
|
+
skippedKeys: string[];
|
|
25
|
+
}
|
|
19
26
|
export interface ModelSummary {
|
|
20
27
|
key: string;
|
|
21
28
|
count: number;
|
|
@@ -36,6 +43,8 @@ export declare class DcuplHostService {
|
|
|
36
43
|
private _autoUpdate;
|
|
37
44
|
private _dirty;
|
|
38
45
|
private _dataKeyProperties;
|
|
46
|
+
private _stagedKeys;
|
|
47
|
+
private _stagedModelKeys;
|
|
39
48
|
init(options?: HostInitOptions): Promise<void>;
|
|
40
49
|
private get d();
|
|
41
50
|
private requireModel;
|
|
@@ -52,9 +61,12 @@ export declare class DcuplHostService {
|
|
|
52
61
|
modelGet(key: string): any;
|
|
53
62
|
modelSet(model: any): void;
|
|
54
63
|
modelRemove(key: string): void;
|
|
64
|
+
private rowKeys;
|
|
65
|
+
private builtKeys;
|
|
66
|
+
private matchExisting;
|
|
55
67
|
private assertRegisteredOrAutoGen;
|
|
56
68
|
private resolveDataApplyOptions;
|
|
57
|
-
dataUpdate(data: any[], options: DataMutationHostOptions):
|
|
69
|
+
dataUpdate(data: any[], options: DataMutationHostOptions): DataUpdateResult;
|
|
58
70
|
dataUpsert(data: any[], options: DataMutationHostOptions): void;
|
|
59
71
|
dataSet(data: any[], options: DataMutationHostOptions): void;
|
|
60
72
|
dataRemove(data: any[], options: DataMutationHostOptions): void;
|
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.DcuplHostService = exports.ModelNotFoundError = void 0;
|
|
3
|
+
exports.DcuplHostService = exports.SKIPPED_KEYS_LIMIT = exports.ModelNotFoundError = void 0;
|
|
4
|
+
exports.parseKeyProperty = parseKeyProperty;
|
|
4
5
|
const tslib_1 = require("tslib");
|
|
5
6
|
const common_1 = require("@nestjs/common");
|
|
6
7
|
const core_1 = require("@dcupl/core");
|
|
7
8
|
const init_options_js_1 = require("./init-options.js");
|
|
8
9
|
const normalize_query_js_1 = require("./normalize-query.js");
|
|
10
|
+
const staged_keys_js_1 = require("./staged-keys.js");
|
|
9
11
|
const attribute_validation_js_1 = require("./attribute-validation.js");
|
|
10
12
|
class ModelNotFoundError extends Error {
|
|
11
13
|
constructor(modelKey, hint) {
|
|
@@ -15,6 +17,17 @@ class ModelNotFoundError extends Error {
|
|
|
15
17
|
}
|
|
16
18
|
}
|
|
17
19
|
exports.ModelNotFoundError = ModelNotFoundError;
|
|
20
|
+
function parseKeyProperty(keyProperty) {
|
|
21
|
+
if (keyProperty === undefined)
|
|
22
|
+
return undefined;
|
|
23
|
+
const columns = (Array.isArray(keyProperty) ? keyProperty : keyProperty.split(','))
|
|
24
|
+
.map((column) => column.trim())
|
|
25
|
+
.filter(Boolean);
|
|
26
|
+
if (columns.length === 0)
|
|
27
|
+
return Array.isArray(keyProperty) ? undefined : keyProperty;
|
|
28
|
+
return columns.length === 1 && !Array.isArray(keyProperty) ? columns[0] : columns;
|
|
29
|
+
}
|
|
30
|
+
exports.SKIPPED_KEYS_LIMIT = 20;
|
|
18
31
|
let DcuplHostService = class DcuplHostService {
|
|
19
32
|
constructor() {
|
|
20
33
|
this._lastActivity = Date.now();
|
|
@@ -24,6 +37,8 @@ let DcuplHostService = class DcuplHostService {
|
|
|
24
37
|
this._autoUpdate = false;
|
|
25
38
|
this._dirty = false;
|
|
26
39
|
this._dataKeyProperties = new Map();
|
|
40
|
+
this._stagedKeys = new staged_keys_js_1.StagedKeys();
|
|
41
|
+
this._stagedModelKeys = new Map();
|
|
27
42
|
}
|
|
28
43
|
async init(options = {}) {
|
|
29
44
|
this.autoGenerateProperties = options.autoGenerateProperties ?? false;
|
|
@@ -31,6 +46,8 @@ let DcuplHostService = class DcuplHostService {
|
|
|
31
46
|
this._dirty = false;
|
|
32
47
|
this._initializedModels.clear();
|
|
33
48
|
this._dataKeyProperties.clear();
|
|
49
|
+
this._stagedKeys.clear();
|
|
50
|
+
this._stagedModelKeys.clear();
|
|
34
51
|
this.dcupl = new core_1.Dcupl((0, init_options_js_1.buildDcuplInitOptions)(options.dcuplOptions));
|
|
35
52
|
await this.dcupl.init();
|
|
36
53
|
this.touch();
|
|
@@ -120,6 +137,10 @@ let DcuplHostService = class DcuplHostService {
|
|
|
120
137
|
modelSet(model) {
|
|
121
138
|
this.touch();
|
|
122
139
|
this.d.models.set(model);
|
|
140
|
+
this._stagedModelKeys.set(model.key, {
|
|
141
|
+
keyProperty: model.keyProperty,
|
|
142
|
+
keyPropertySeparator: model.keyPropertySeparator,
|
|
143
|
+
});
|
|
123
144
|
this._dirty = true;
|
|
124
145
|
this._initializedModels.add(model.key);
|
|
125
146
|
}
|
|
@@ -129,6 +150,53 @@ let DcuplHostService = class DcuplHostService {
|
|
|
129
150
|
this._dirty = true;
|
|
130
151
|
this._initializedModels.delete(key);
|
|
131
152
|
this._dataKeyProperties.delete(key);
|
|
153
|
+
this._stagedKeys.drop(key);
|
|
154
|
+
this._stagedModelKeys.delete(key);
|
|
155
|
+
}
|
|
156
|
+
rowKeys(model, rows, keyProperty) {
|
|
157
|
+
const def = this._stagedModelKeys.get(model) ?? this.d.models.get(model);
|
|
158
|
+
return (0, staged_keys_js_1.deriveRowKeys)(rows, keyProperty ?? def?.keyProperty, def?.keyPropertySeparator);
|
|
159
|
+
}
|
|
160
|
+
builtKeys(model, keys) {
|
|
161
|
+
if (keys.length === 0)
|
|
162
|
+
return new Set();
|
|
163
|
+
try {
|
|
164
|
+
const items = this.d.query.many({ modelKey: model, itemKeys: keys, projection: { $: false } });
|
|
165
|
+
return new Set(items.map((item) => String(item?.key)));
|
|
166
|
+
}
|
|
167
|
+
catch {
|
|
168
|
+
return new Set();
|
|
169
|
+
}
|
|
170
|
+
}
|
|
171
|
+
matchExisting(model, rows, keyProperty) {
|
|
172
|
+
const keys = this.rowKeys(model, rows, keyProperty);
|
|
173
|
+
const exists = new Map();
|
|
174
|
+
const unresolved = [];
|
|
175
|
+
for (const key of new Set(keys)) {
|
|
176
|
+
if (key === undefined)
|
|
177
|
+
continue;
|
|
178
|
+
const staged = this._stagedKeys.has(model, key);
|
|
179
|
+
if (staged === undefined)
|
|
180
|
+
unresolved.push(key);
|
|
181
|
+
else
|
|
182
|
+
exists.set(key, staged);
|
|
183
|
+
}
|
|
184
|
+
const built = this.builtKeys(model, unresolved);
|
|
185
|
+
for (const key of unresolved)
|
|
186
|
+
exists.set(key, built.has(key));
|
|
187
|
+
let updated = 0;
|
|
188
|
+
let skipped = 0;
|
|
189
|
+
const skippedKeys = new Set();
|
|
190
|
+
for (const key of keys) {
|
|
191
|
+
if (key !== undefined && exists.get(key)) {
|
|
192
|
+
updated++;
|
|
193
|
+
continue;
|
|
194
|
+
}
|
|
195
|
+
skipped++;
|
|
196
|
+
if (key !== undefined && skippedKeys.size < exports.SKIPPED_KEYS_LIMIT)
|
|
197
|
+
skippedKeys.add(key);
|
|
198
|
+
}
|
|
199
|
+
return { updated, skipped, skippedKeys: [...skippedKeys] };
|
|
132
200
|
}
|
|
133
201
|
assertRegisteredOrAutoGen(model, override) {
|
|
134
202
|
if (this.d.models.get(model))
|
|
@@ -156,71 +224,83 @@ let DcuplHostService = class DcuplHostService {
|
|
|
156
224
|
dataUpdate(data, options) {
|
|
157
225
|
this.touch();
|
|
158
226
|
this.assertRegisteredOrAutoGen(options.model, options.autoGenerateProperties);
|
|
159
|
-
|
|
227
|
+
const keyProperty = parseKeyProperty(options.keyProperty);
|
|
228
|
+
this.trackKeyProperty(options.model, keyProperty);
|
|
160
229
|
const { autoGenerateProperties } = this.resolveDataApplyOptions(options.model, options.autoGenerateProperties);
|
|
230
|
+
const result = this.matchExisting(options.model, data, keyProperty);
|
|
161
231
|
this.d.data.apply({
|
|
162
232
|
type: 'update',
|
|
163
233
|
data,
|
|
164
234
|
model: options.model,
|
|
165
|
-
keyProperty
|
|
235
|
+
keyProperty,
|
|
166
236
|
autoGenerateKey: options.autoGenerateKey,
|
|
167
237
|
autoGenerateProperties,
|
|
168
238
|
});
|
|
169
239
|
this._dirty = true;
|
|
240
|
+
return result;
|
|
170
241
|
}
|
|
171
242
|
dataUpsert(data, options) {
|
|
172
243
|
this.touch();
|
|
173
244
|
this.assertRegisteredOrAutoGen(options.model, options.autoGenerateProperties);
|
|
174
|
-
|
|
245
|
+
const keyProperty = parseKeyProperty(options.keyProperty);
|
|
246
|
+
this.trackKeyProperty(options.model, keyProperty);
|
|
175
247
|
const { useSetType, autoGenerateProperties } = this.resolveDataApplyOptions(options.model, options.autoGenerateProperties);
|
|
176
248
|
this.d.data.apply({
|
|
177
249
|
type: useSetType ? 'set' : 'upsert',
|
|
178
250
|
data,
|
|
179
251
|
model: options.model,
|
|
180
|
-
keyProperty
|
|
252
|
+
keyProperty,
|
|
181
253
|
autoGenerateKey: options.autoGenerateKey,
|
|
182
254
|
autoGenerateProperties,
|
|
183
255
|
});
|
|
256
|
+
this._stagedKeys.upsert(options.model, this.rowKeys(options.model, data, keyProperty));
|
|
184
257
|
this._dirty = true;
|
|
185
258
|
}
|
|
186
259
|
dataSet(data, options) {
|
|
187
260
|
this.touch();
|
|
188
261
|
this.assertRegisteredOrAutoGen(options.model, options.autoGenerateProperties);
|
|
189
|
-
|
|
262
|
+
const keyProperty = parseKeyProperty(options.keyProperty);
|
|
263
|
+
this.trackKeyProperty(options.model, keyProperty);
|
|
190
264
|
const { autoGenerateProperties } = this.resolveDataApplyOptions(options.model, options.autoGenerateProperties);
|
|
191
265
|
this.d.data.apply({
|
|
192
266
|
type: 'set',
|
|
193
267
|
data,
|
|
194
268
|
model: options.model,
|
|
195
|
-
keyProperty
|
|
269
|
+
keyProperty,
|
|
196
270
|
autoGenerateKey: options.autoGenerateKey,
|
|
197
271
|
autoGenerateProperties,
|
|
198
272
|
});
|
|
273
|
+
this._stagedKeys.set(options.model, this.rowKeys(options.model, data, keyProperty));
|
|
199
274
|
this._dirty = true;
|
|
200
275
|
}
|
|
201
276
|
dataRemove(data, options) {
|
|
202
277
|
this.touch();
|
|
203
278
|
this.requireModel(options.model);
|
|
204
|
-
|
|
279
|
+
const keyProperty = parseKeyProperty(options.keyProperty);
|
|
280
|
+
this.trackKeyProperty(options.model, keyProperty);
|
|
205
281
|
const { autoGenerateProperties } = this.resolveDataApplyOptions(options.model, options.autoGenerateProperties);
|
|
206
282
|
this.d.data.apply({
|
|
207
283
|
type: 'remove',
|
|
208
284
|
data,
|
|
209
285
|
model: options.model,
|
|
210
|
-
keyProperty
|
|
286
|
+
keyProperty,
|
|
211
287
|
autoGenerateKey: options.autoGenerateKey,
|
|
212
288
|
autoGenerateProperties,
|
|
213
289
|
});
|
|
290
|
+
this._stagedKeys.remove(options.model, this.rowKeys(options.model, data, keyProperty));
|
|
214
291
|
this._dirty = true;
|
|
215
292
|
}
|
|
216
293
|
dataReset(model) {
|
|
217
294
|
this.touch();
|
|
218
295
|
this.requireModel(model);
|
|
219
296
|
this.d.data.reset({ model });
|
|
297
|
+
this._stagedKeys.set(model, []);
|
|
220
298
|
this._dirty = true;
|
|
221
299
|
}
|
|
222
300
|
async update() {
|
|
223
301
|
this.touch();
|
|
302
|
+
this._stagedKeys = new staged_keys_js_1.StagedKeys();
|
|
303
|
+
this._stagedModelKeys = new Map();
|
|
224
304
|
await this.d.update();
|
|
225
305
|
this._dirty = false;
|
|
226
306
|
}
|
|
@@ -311,6 +391,8 @@ let DcuplHostService = class DcuplHostService {
|
|
|
311
391
|
this.dcupl = undefined;
|
|
312
392
|
this._initializedModels.clear();
|
|
313
393
|
this._dataKeyProperties.clear();
|
|
394
|
+
this._stagedKeys.clear();
|
|
395
|
+
this._stagedModelKeys.clear();
|
|
314
396
|
}
|
|
315
397
|
attachLoader(loader, key) {
|
|
316
398
|
this.touch();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dcupl-host.service.js","sourceRoot":"","sources":["../../../../../src/functions/app/daemon/services/dcupl-host.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"dcupl-host.service.js","sourceRoot":"","sources":["../../../../../src/functions/app/daemon/services/dcupl-host.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,21 +6,22 @@ const common_1 = require("@nestjs/common");
|
|
|
6
6
|
const fs_extra_1 = require("fs-extra");
|
|
7
7
|
const path_1 = require("path");
|
|
8
8
|
const axios_1 = tslib_1.__importDefault(require("axios"));
|
|
9
|
+
const csv_delimiter_js_1 = require("./csv-delimiter.js");
|
|
9
10
|
let IngestService = class IngestService {
|
|
10
11
|
async fromFile(path, options = {}) {
|
|
11
12
|
const text = (0, fs_extra_1.readFileSync)(path, 'utf-8');
|
|
12
13
|
const fmt = options.format ?? this.detectFormat(path, text);
|
|
13
|
-
return this.parse(text, fmt);
|
|
14
|
+
return this.parse(text, fmt, options);
|
|
14
15
|
}
|
|
15
16
|
async fromUrl(url, options = {}) {
|
|
16
17
|
const res = await axios_1.default.get(url, { responseType: 'text' });
|
|
17
18
|
const text = typeof res.data === 'string' ? res.data : JSON.stringify(res.data);
|
|
18
19
|
const fmt = options.format ?? this.detectFormatFromContent(text, url);
|
|
19
|
-
return this.parse(text, fmt);
|
|
20
|
+
return this.parse(text, fmt, options);
|
|
20
21
|
}
|
|
21
22
|
async fromString(text, options = {}) {
|
|
22
23
|
const fmt = options.format ?? this.detectFormatFromContent(text, '<inline>');
|
|
23
|
-
return this.parse(text, fmt);
|
|
24
|
+
return this.parse(text, fmt, options);
|
|
24
25
|
}
|
|
25
26
|
detectFormat(path, text) {
|
|
26
27
|
const ext = (0, path_1.extname)(path).toLowerCase();
|
|
@@ -45,7 +46,7 @@ let IngestService = class IngestService {
|
|
|
45
46
|
return 'ndjson';
|
|
46
47
|
}
|
|
47
48
|
}
|
|
48
|
-
parse(text, fmt) {
|
|
49
|
+
parse(text, fmt, options = {}) {
|
|
49
50
|
if (text.charCodeAt(0) === 0xfeff) {
|
|
50
51
|
text = text.slice(1);
|
|
51
52
|
}
|
|
@@ -60,14 +61,15 @@ let IngestService = class IngestService {
|
|
|
60
61
|
.filter((l) => l.length > 0)
|
|
61
62
|
.map((l) => JSON.parse(l));
|
|
62
63
|
}
|
|
63
|
-
return parseCsv(text);
|
|
64
|
+
return parseCsv(text, options.delimiter);
|
|
64
65
|
}
|
|
65
66
|
};
|
|
66
67
|
exports.IngestService = IngestService;
|
|
67
68
|
exports.IngestService = IngestService = tslib_1.__decorate([
|
|
68
69
|
(0, common_1.Injectable)()
|
|
69
70
|
], IngestService);
|
|
70
|
-
function parseCsv(text) {
|
|
71
|
+
function parseCsv(text, delimiter) {
|
|
72
|
+
const separator = delimiter || (0, csv_delimiter_js_1.detectCsvDelimiter)(text).delimiter || ',';
|
|
71
73
|
const rows = [];
|
|
72
74
|
let row = [];
|
|
73
75
|
let field = '';
|
|
@@ -92,7 +94,7 @@ function parseCsv(text) {
|
|
|
92
94
|
if (ch === '"') {
|
|
93
95
|
inQuotes = true;
|
|
94
96
|
}
|
|
95
|
-
else if (ch ===
|
|
97
|
+
else if (ch === separator) {
|
|
96
98
|
row.push(field);
|
|
97
99
|
field = '';
|
|
98
100
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ingest.service.js","sourceRoot":"","sources":["../../../../../src/functions/app/daemon/services/ingest.service.ts"],"names":[],"mappings":";;;;AAAA,2CAA4C;AAC5C,uCAAwC;AACxC,+BAA+B;AAC/B,0DAA0B;
|
|
1
|
+
{"version":3,"file":"ingest.service.js","sourceRoot":"","sources":["../../../../../src/functions/app/daemon/services/ingest.service.ts"],"names":[],"mappings":";;;;AAAA,2CAA4C;AAC5C,uCAAwC;AACxC,+BAA+B;AAC/B,0DAA0B;AAC1B,yDAAwD;AAWjD,IAAM,aAAa,GAAnB,MAAM,aAAa;IACxB,KAAK,CAAC,QAAQ,CAAC,IAAY,EAAE,UAAyB,EAAE;QACtD,MAAM,IAAI,GAAG,IAAA,uBAAY,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACzC,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,IAAI,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAC5D,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;IACxC,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,GAAW,EAAE,UAAyB,EAAE;QACpD,MAAM,GAAG,GAAG,MAAM,eAAK,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC,CAAC;QAC3D,MAAM,IAAI,GAAG,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAChF,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,IAAI,IAAI,CAAC,uBAAuB,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QACtE,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;IACxC,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,IAAY,EAAE,UAAyB,EAAE;QACxD,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,IAAI,IAAI,CAAC,uBAAuB,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QAC7E,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;IACxC,CAAC;IAEO,YAAY,CAAC,IAAY,EAAE,IAAY;QAC7C,MAAM,GAAG,GAAG,IAAA,cAAO,EAAC,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC;QACxC,IAAI,GAAG,KAAK,MAAM;YAAE,OAAO,KAAK,CAAC;QACjC,IAAI,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,QAAQ;YAAE,OAAO,QAAQ,CAAC;QAC3D,IAAI,GAAG,KAAK,OAAO;YAAE,OAAO,MAAM,CAAC;QACnC,OAAO,IAAI,CAAC,uBAAuB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAClD,CAAC;IAEO,uBAAuB,CAAC,IAAY,EAAE,IAAY;QACxD,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QAC5B,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YACzD,MAAM,IAAI,KAAK,CAAC,2BAA2B,IAAI,iBAAiB,CAAC,CAAC;QACpE,CAAC;QACD,IAAI,CAAC;YACH,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACpB,OAAO,MAAM,CAAC;QAChB,CAAC;QAAC,MAAM,CAAC;YAEP,OAAO,QAAQ,CAAC;QAClB,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,IAAY,EAAE,GAAiB,EAAE,UAAyB,EAAE;QAExE,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,MAAM,EAAE,CAAC;YAClC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACvB,CAAC;QACD,IAAI,GAAG,KAAK,MAAM,EAAE,CAAC;YACnB,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAChC,OAAO,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;QACnD,CAAC;QACD,IAAI,GAAG,KAAK,QAAQ,EAAE,CAAC;YACrB,OAAO,IAAI;iBACR,KAAK,CAAC,IAAI,CAAC;iBACX,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;iBACpB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;iBAC3B,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/B,CAAC;QACD,OAAO,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;IAC3C,CAAC;CACF,CAAA;AA3DY,sCAAa;wBAAb,aAAa;IADzB,IAAA,mBAAU,GAAE;GACA,aAAa,CA2DzB;AAOD,SAAS,QAAQ,CAAC,IAAY,EAAE,SAAkB;IAChD,MAAM,SAAS,GAAG,SAAS,IAAI,IAAA,qCAAkB,EAAC,IAAI,CAAC,CAAC,SAAS,IAAI,GAAG,CAAC;IACzE,MAAM,IAAI,GAAe,EAAE,CAAC;IAC5B,IAAI,GAAG,GAAa,EAAE,CAAC;IACvB,IAAI,KAAK,GAAG,EAAE,CAAC;IACf,IAAI,QAAQ,GAAG,KAAK,CAAC;IAErB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACrC,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QACnB,IAAI,QAAQ,EAAE,CAAC;YACb,IAAI,EAAE,KAAK,GAAG,EAAE,CAAC;gBACf,IAAI,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;oBACxB,KAAK,IAAI,GAAG,CAAC;oBACb,CAAC,EAAE,CAAC;gBACN,CAAC;qBAAM,CAAC;oBACN,QAAQ,GAAG,KAAK,CAAC;gBACnB,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,KAAK,IAAI,EAAE,CAAC;YACd,CAAC;QACH,CAAC;aAAM,CAAC;YACN,IAAI,EAAE,KAAK,GAAG,EAAE,CAAC;gBACf,QAAQ,GAAG,IAAI,CAAC;YAClB,CAAC;iBAAM,IAAI,EAAE,KAAK,SAAS,EAAE,CAAC;gBAC5B,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBAChB,KAAK,GAAG,EAAE,CAAC;YACb,CAAC;iBAAM,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC;gBACvB,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBAChB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACf,GAAG,GAAG,EAAE,CAAC;gBACT,KAAK,GAAG,EAAE,CAAC;YACb,CAAC;iBAAM,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC;YAEzB,CAAC;iBAAM,CAAC;gBACN,KAAK,IAAI,EAAE,CAAC;YACd,CAAC;QACH,CAAC;IACH,CAAC;IACD,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAChB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACjB,CAAC;IAED,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IACjC,MAAM,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;IACvB,OAAO,IAAI;SACR,KAAK,CAAC,CAAC,CAAC;SACR,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC;SAC/C,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QACT,MAAM,GAAG,GAA2B,EAAE,CAAC;QACvC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YACtB,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QACtB,CAAC,CAAC,CAAC;QACH,OAAO,GAAG,CAAC;IACb,CAAC,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -20,7 +20,7 @@ export declare class LoadersService {
|
|
|
20
20
|
process(key: string, opts: ProcessOptionsWire): Promise<ProcessLoaderResponse>;
|
|
21
21
|
list(): LoaderEntry[];
|
|
22
22
|
get(key: string): LoaderDetail;
|
|
23
|
-
remove(key: string): void
|
|
23
|
+
remove(key: string): Promise<void>;
|
|
24
24
|
private requireSlot;
|
|
25
25
|
private toFetchOptions;
|
|
26
26
|
private attemptedConfigUrl;
|
|
@@ -94,6 +94,9 @@ let LoadersService = class LoadersService {
|
|
|
94
94
|
}
|
|
95
95
|
catch (err) {
|
|
96
96
|
slot.entry.status = 'error';
|
|
97
|
+
if (err?.name === 'SharedModelKeyError') {
|
|
98
|
+
throw new LoaderError_('LOADER_SHARED_MODEL_KEY', err.message, { loader: key });
|
|
99
|
+
}
|
|
97
100
|
throw new LoaderError_('LOADER_PROCESS_FAILED', err?.message ?? 'process() failed');
|
|
98
101
|
}
|
|
99
102
|
const counts = this.countResources(slot.progress);
|
|
@@ -115,11 +118,14 @@ let LoadersService = class LoadersService {
|
|
|
115
118
|
errors: [...slot.errors],
|
|
116
119
|
};
|
|
117
120
|
}
|
|
118
|
-
remove(key) {
|
|
121
|
+
async remove(key) {
|
|
119
122
|
const slot = this.requireSlot(key);
|
|
120
123
|
slot.unsub();
|
|
121
124
|
this.host.detachLoader(key);
|
|
122
125
|
this.map.delete(key);
|
|
126
|
+
this.host.markDirty();
|
|
127
|
+
if (this.host.autoUpdate)
|
|
128
|
+
await this.host.update();
|
|
123
129
|
}
|
|
124
130
|
requireSlot(key) {
|
|
125
131
|
const slot = this.map.get(key);
|