@riverscapes/common 1.2.0 → 1.3.1
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/api.d.ts +25 -19
- package/dist/api.js +118 -37
- package/dist/api.js.map +1 -1
- package/dist/classes/BusinessLogic.d.ts +11 -0
- package/dist/classes/BusinessLogic.js +90 -0
- package/dist/classes/BusinessLogic.js.map +1 -0
- package/dist/classes/FeatureFlags.d.ts +6 -0
- package/dist/classes/FeatureFlags.js +25 -0
- package/dist/classes/FeatureFlags.js.map +1 -0
- package/dist/classes/Program.d.ts +1 -1
- package/dist/classes/Program.js +4 -2
- package/dist/classes/Program.js.map +1 -1
- package/dist/classes/Project.d.ts +4 -4
- package/dist/classes/Project.js +18 -7
- package/dist/classes/Project.js.map +1 -1
- package/dist/classes/TileIndexJSON.d.ts +21 -0
- package/dist/classes/TileIndexJSON.js +10 -0
- package/dist/classes/TileIndexJSON.js.map +1 -0
- package/dist/classes/TileServiceJSONClass.d.ts +22 -0
- package/dist/classes/TileServiceJSONClass.js +11 -0
- package/dist/classes/TileServiceJSONClass.js.map +1 -0
- package/dist/classes/errors.js +3 -1
- package/dist/classes/errors.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.js +7 -2
- package/dist/index.js.map +1 -1
- package/dist/schema.graphql.js +2 -1
- package/dist/schema.graphql.js.map +1 -1
- package/dist/types.d.ts +181 -8
- package/dist/types.js +61 -1
- package/dist/types.js.map +1 -1
- package/dist/xml.d.ts +2 -1
- package/dist/xml.js +52 -42
- package/dist/xml.js.map +1 -1
- package/package.json +11 -10
package/dist/types.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.AccessEnum = exports.WarehouseRoleEnum = exports.FieldTypeEnum = void 0;
|
|
3
|
+
exports.ProjectTreeLayerTileTypes = exports.ProjectTreeLayerTypes = exports.TileTypes = exports.SymbologyStatus = exports.TilingStatusFinished = exports.TilingStatus = exports.RampType = exports.AccessEnum = exports.WarehouseRoleEnum = exports.FieldTypeEnum = void 0;
|
|
4
4
|
var FieldTypeEnum;
|
|
5
5
|
(function (FieldTypeEnum) {
|
|
6
6
|
FieldTypeEnum["string"] = "S";
|
|
@@ -22,4 +22,64 @@ var AccessEnum;
|
|
|
22
22
|
AccessEnum["Private"] = "PRIVATE";
|
|
23
23
|
AccessEnum["Secret"] = "SECRET";
|
|
24
24
|
})(AccessEnum = exports.AccessEnum || (exports.AccessEnum = {}));
|
|
25
|
+
var RampType;
|
|
26
|
+
(function (RampType) {
|
|
27
|
+
RampType["INTERPOLATED"] = "INTERPOLATED";
|
|
28
|
+
RampType["DISCRETE"] = "DISCRETE";
|
|
29
|
+
RampType["EXACT"] = "EXACT";
|
|
30
|
+
})(RampType = exports.RampType || (exports.RampType = {}));
|
|
31
|
+
var TilingStatus;
|
|
32
|
+
(function (TilingStatus) {
|
|
33
|
+
TilingStatus["UNKNOWN"] = "UNKNOWN";
|
|
34
|
+
TilingStatus["QUEUED"] = "QUEUED";
|
|
35
|
+
TilingStatus["FETCHING"] = "FETCHING";
|
|
36
|
+
TilingStatus["NOT_APPLICABLE"] = "NOT_APPLICABLE";
|
|
37
|
+
TilingStatus["CREATING"] = "CREATING";
|
|
38
|
+
TilingStatus["NO_GEOMETRIES"] = "NO_GEOMETRIES";
|
|
39
|
+
TilingStatus["TIMEOUT"] = "TIMEOUT";
|
|
40
|
+
TilingStatus["TILING_ERROR"] = "TILING_ERROR";
|
|
41
|
+
TilingStatus["INDEX_NOT_FOUND"] = "INDEX_NOT_FOUND";
|
|
42
|
+
TilingStatus["LAYER_NOT_FOUND"] = "LAYER_NOT_FOUND";
|
|
43
|
+
TilingStatus["FETCH_ERROR"] = "FETCH_ERROR";
|
|
44
|
+
TilingStatus["SUCCESS"] = "SUCCESS";
|
|
45
|
+
})(TilingStatus = exports.TilingStatus || (exports.TilingStatus = {}));
|
|
46
|
+
exports.TilingStatusFinished = [
|
|
47
|
+
TilingStatus.NOT_APPLICABLE,
|
|
48
|
+
TilingStatus.NO_GEOMETRIES,
|
|
49
|
+
TilingStatus.TIMEOUT,
|
|
50
|
+
TilingStatus.TILING_ERROR,
|
|
51
|
+
TilingStatus.SUCCESS
|
|
52
|
+
];
|
|
53
|
+
var SymbologyStatus;
|
|
54
|
+
(function (SymbologyStatus) {
|
|
55
|
+
SymbologyStatus["UNKNOWN"] = "UNKNOWN";
|
|
56
|
+
SymbologyStatus["FETCHING"] = "FETCHING";
|
|
57
|
+
SymbologyStatus["MISSING"] = "MISSING";
|
|
58
|
+
SymbologyStatus["NOT_APPLICABLE"] = "NOT_APPLICABLE";
|
|
59
|
+
SymbologyStatus["FOUND"] = "FOUND";
|
|
60
|
+
SymbologyStatus["ERROR"] = "ERROR";
|
|
61
|
+
})(SymbologyStatus = exports.SymbologyStatus || (exports.SymbologyStatus = {}));
|
|
62
|
+
var TileTypes;
|
|
63
|
+
(function (TileTypes) {
|
|
64
|
+
TileTypes["RASTER"] = "RASTER";
|
|
65
|
+
TileTypes["HTML"] = "HTML";
|
|
66
|
+
TileTypes["VECTOR_SHP"] = "VECTOR_SHP";
|
|
67
|
+
TileTypes["VECTOR_GPKG"] = "VECTOR_GPKG";
|
|
68
|
+
})(TileTypes = exports.TileTypes || (exports.TileTypes = {}));
|
|
69
|
+
var ProjectTreeLayerTypes;
|
|
70
|
+
(function (ProjectTreeLayerTypes) {
|
|
71
|
+
ProjectTreeLayerTypes["REPORT"] = "report";
|
|
72
|
+
ProjectTreeLayerTypes["RASTER"] = "raster";
|
|
73
|
+
ProjectTreeLayerTypes["LINE"] = "line";
|
|
74
|
+
ProjectTreeLayerTypes["POLYGON"] = "polygon";
|
|
75
|
+
ProjectTreeLayerTypes["POINT"] = "point";
|
|
76
|
+
ProjectTreeLayerTypes["FILE"] = "file";
|
|
77
|
+
ProjectTreeLayerTypes["TIN"] = "tin";
|
|
78
|
+
})(ProjectTreeLayerTypes = exports.ProjectTreeLayerTypes || (exports.ProjectTreeLayerTypes = {}));
|
|
79
|
+
exports.ProjectTreeLayerTileTypes = [
|
|
80
|
+
ProjectTreeLayerTypes.RASTER,
|
|
81
|
+
ProjectTreeLayerTypes.POLYGON,
|
|
82
|
+
ProjectTreeLayerTypes.LINE,
|
|
83
|
+
ProjectTreeLayerTypes.POINT
|
|
84
|
+
];
|
|
25
85
|
//# sourceMappingURL=types.js.map
|
package/dist/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";;;AAoBA,IAAY,aAMX;AAND,WAAY,aAAa;IACrB,6BAAY,CAAA;IACZ,6BAAY,CAAA;IACZ,iCAAgB,CAAA;IAChB,mCAAkB,CAAA;IAClB,mCAAkB,CAAA;AACtB,CAAC,EANW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAMxB;AAED,IAAY,iBAKX;AALD,WAAY,iBAAiB;IACzB,wCAAmB,CAAA;IACnB,oCAAe,CAAA;IACf,0CAAqB,CAAA;IACrB,gDAA2B,CAAA;AAC/B,CAAC,EALW,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QAK5B;AAED,IAAY,UAIX;AAJD,WAAY,UAAU;IAClB,+BAAiB,CAAA;IACjB,iCAAmB,CAAA;IACnB,+BAAiB,CAAA;AACrB,CAAC,EAJW,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAIrB"}
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";;;AAoBA,IAAY,aAMX;AAND,WAAY,aAAa;IACrB,6BAAY,CAAA;IACZ,6BAAY,CAAA;IACZ,iCAAgB,CAAA;IAChB,mCAAkB,CAAA;IAClB,mCAAkB,CAAA;AACtB,CAAC,EANW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAMxB;AAED,IAAY,iBAKX;AALD,WAAY,iBAAiB;IACzB,wCAAmB,CAAA;IACnB,oCAAe,CAAA;IACf,0CAAqB,CAAA;IACrB,gDAA2B,CAAA;AAC/B,CAAC,EALW,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QAK5B;AAED,IAAY,UAIX;AAJD,WAAY,UAAU;IAClB,+BAAiB,CAAA;IACjB,iCAAmB,CAAA;IACnB,+BAAiB,CAAA;AACrB,CAAC,EAJW,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAIrB;AAGD,IAAY,QAIX;AAJD,WAAY,QAAQ;IAChB,yCAA6B,CAAA;IAC7B,iCAAqB,CAAA;IACrB,2BAAe,CAAA;AACnB,CAAC,EAJW,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QAInB;AAyMD,IAAY,YAaX;AAbD,WAAY,YAAY;IACpB,mCAAmB,CAAA;IACnB,iCAAiB,CAAA;IACjB,qCAAqB,CAAA;IACrB,iDAAiC,CAAA;IACjC,qCAAqB,CAAA;IACrB,+CAA+B,CAAA;IAC/B,mCAAmB,CAAA;IACnB,6CAA6B,CAAA;IAC7B,mDAAmC,CAAA;IACnC,mDAAmC,CAAA;IACnC,2CAA2B,CAAA;IAC3B,mCAAmB,CAAA;AACvB,CAAC,EAbW,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAavB;AAEY,QAAA,oBAAoB,GAAG;IAChC,YAAY,CAAC,cAAc;IAC3B,YAAY,CAAC,aAAa;IAC1B,YAAY,CAAC,OAAO;IACpB,YAAY,CAAC,YAAY;IACzB,YAAY,CAAC,OAAO;CACvB,CAAA;AAED,IAAY,eAOX;AAPD,WAAY,eAAe;IACvB,sCAAmB,CAAA;IACnB,wCAAqB,CAAA;IACrB,sCAAmB,CAAA;IACnB,oDAAiC,CAAA;IACjC,kCAAe,CAAA;IACf,kCAAe,CAAA;AACnB,CAAC,EAPW,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAO1B;AAED,IAAY,SAKX;AALD,WAAY,SAAS;IACjB,8BAAiB,CAAA;IACjB,0BAAa,CAAA;IACb,sCAAyB,CAAA;IACzB,wCAA2B,CAAA;AAC/B,CAAC,EALW,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAKpB;AAsFD,IAAY,qBAQX;AARD,WAAY,qBAAqB;IAC7B,0CAAiB,CAAA;IACjB,0CAAiB,CAAA;IACjB,sCAAa,CAAA;IACb,4CAAmB,CAAA;IACnB,wCAAe,CAAA;IACf,sCAAa,CAAA;IACb,oCAAW,CAAA;AACf,CAAC,EARW,qBAAqB,GAArB,6BAAqB,KAArB,6BAAqB,QAQhC;AAEY,QAAA,yBAAyB,GAAG;IACrC,qBAAqB,CAAC,MAAM;IAC5B,qBAAqB,CAAC,OAAO;IAC7B,qBAAqB,CAAC,IAAI;IAC1B,qBAAqB,CAAC,KAAK;CAC9B,CAAA"}
|
package/dist/xml.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
import { MetaData, ProjectXMLType } from './types';
|
|
1
|
+
import { XMLMetaType, MetaData, ProjectXMLType } from './types';
|
|
2
2
|
import { Program } from './';
|
|
3
3
|
export declare function getXML(url: string): Promise<string>;
|
|
4
|
+
export declare function parseXMLMeta(metaArr: XMLMetaType[]): MetaData;
|
|
4
5
|
export declare function parseProgramXML(rawXML: string): Promise<Program>;
|
|
5
6
|
export declare function parseProjectXML(rawXML: string): Promise<ProjectXMLType>;
|
|
6
7
|
export declare function augmentXML(newMeta: MetaData, xmlfile: string): string;
|
package/dist/xml.js
CHANGED
|
@@ -61,23 +61,28 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
61
61
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
62
62
|
};
|
|
63
63
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
64
|
-
exports.verifyMeta = exports.augmentXML = exports.parseProjectXML = exports.parseProgramXML = exports.getXML = void 0;
|
|
64
|
+
exports.verifyMeta = exports.augmentXML = exports.parseProjectXML = exports.parseProgramXML = exports.parseXMLMeta = exports.getXML = void 0;
|
|
65
65
|
var xml2js_1 = require("xml2js");
|
|
66
66
|
var axios_1 = __importDefault(require("axios"));
|
|
67
|
-
var common_1 = require("@northarrowresearch/common");
|
|
68
67
|
var _1 = require("./");
|
|
69
68
|
var xmldom_1 = __importDefault(require("xmldom"));
|
|
69
|
+
var loglevel_1 = __importDefault(require("loglevel"));
|
|
70
70
|
function getXML(url) {
|
|
71
71
|
return __awaiter(this, void 0, void 0, function () {
|
|
72
|
-
var result;
|
|
72
|
+
var start, result, duration;
|
|
73
73
|
return __generator(this, function (_a) {
|
|
74
74
|
switch (_a.label) {
|
|
75
|
-
case 0:
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
75
|
+
case 0:
|
|
76
|
+
start = Date.now();
|
|
77
|
+
return [4, (0, axios_1.default)({
|
|
78
|
+
url: url,
|
|
79
|
+
method: 'get'
|
|
80
|
+
})];
|
|
79
81
|
case 1:
|
|
80
82
|
result = _a.sent();
|
|
83
|
+
duration = (Date.now() - start) / 1000;
|
|
84
|
+
if (duration > 10)
|
|
85
|
+
loglevel_1.default.warn("getXML took ".concat(duration.toFixed(1), " seconds"));
|
|
81
86
|
if (!result.data)
|
|
82
87
|
throw new Error('Error retrieving XML file');
|
|
83
88
|
return [2, result.data];
|
|
@@ -86,13 +91,19 @@ function getXML(url) {
|
|
|
86
91
|
});
|
|
87
92
|
}
|
|
88
93
|
exports.getXML = getXML;
|
|
89
|
-
function
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
94
|
+
function parseXMLMeta(metaArr) {
|
|
95
|
+
try {
|
|
96
|
+
return metaArr.reduce(function (acc, _a) {
|
|
97
|
+
var _b;
|
|
98
|
+
var $ = _a.$, _ = _a._;
|
|
99
|
+
return (__assign(__assign({}, acc), (_b = {}, _b[$.name] = _ && _.trim(), _b)));
|
|
100
|
+
}, {});
|
|
101
|
+
}
|
|
102
|
+
catch (_a) {
|
|
103
|
+
return {};
|
|
104
|
+
}
|
|
95
105
|
}
|
|
106
|
+
exports.parseXMLMeta = parseXMLMeta;
|
|
96
107
|
function _recursePaths(xmlDom, products, groups, collections) {
|
|
97
108
|
var HierarchyNode = xmlDom.getElementsByTagName('Hierarchy')[0];
|
|
98
109
|
var productsInHierarchy = Array.from(HierarchyNode.getElementsByTagName('Product'));
|
|
@@ -102,7 +113,7 @@ function _recursePaths(xmlDom, products, groups, collections) {
|
|
|
102
113
|
var ref = prodEl.getAttribute('ref');
|
|
103
114
|
var product = products.find(function (o) { return o.id === ref; });
|
|
104
115
|
if (!product)
|
|
105
|
-
throw new Error("Product not found for ref='"
|
|
116
|
+
throw new Error("Product not found for ref='".concat(ref, "'"));
|
|
106
117
|
var currEl = prodEl.parentNode;
|
|
107
118
|
var _loop_1 = function () {
|
|
108
119
|
var ref_1 = currEl.getAttribute('ref');
|
|
@@ -126,44 +137,42 @@ function _recursePaths(xmlDom, products, groups, collections) {
|
|
|
126
137
|
}
|
|
127
138
|
function parseProgramXML(rawXML) {
|
|
128
139
|
return __awaiter(this, void 0, void 0, function () {
|
|
129
|
-
var parsedProgramJSON,
|
|
140
|
+
var parsedProgramJSON, _a, projectFile, projectXSDs, meta, collections, groups, productsRaw, xmlDom, products;
|
|
130
141
|
return __generator(this, function (_b) {
|
|
131
142
|
switch (_b.label) {
|
|
132
|
-
case 0: return [4, xml2js_1.parseStringPromise(rawXML).catch(function (err) {
|
|
143
|
+
case 0: return [4, (0, xml2js_1.parseStringPromise)(rawXML).catch(function (err) {
|
|
133
144
|
throw new _1.ValidationError('Error parsing XML file. This likely means a broken or unclosed tag.', [err.message]);
|
|
134
145
|
})];
|
|
135
146
|
case 1:
|
|
136
147
|
parsedProgramJSON = _b.sent();
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
var attr = _a.attr, Allow = _a.Allow, AllowRegex = _a.AllowRegex;
|
|
142
|
-
return (__assign(__assign({}, attr), { Allow: Allow ? (Array.isArray(Allow) ? Allow.map(function (a) { return a.attr; }) : [Allow]) : undefined, AllowRegex: AllowRegex
|
|
148
|
+
_a = parseXMLMeta(parsedProgramJSON.Program.MetaData[0].Meta), projectFile = _a.projectFile, projectXSDs = _a.projectXSDs, meta = __rest(_a, ["projectFile", "projectXSDs"]);
|
|
149
|
+
collections = parsedProgramJSON.Program.Definitions[0].Collections[0].Collection.map(function (_a) {
|
|
150
|
+
var $ = _a.$, Allow = _a.Allow, AllowRegex = _a.AllowRegex;
|
|
151
|
+
return (__assign(__assign({}, $), { Allow: Allow ? (Array.isArray(Allow) ? Allow.map(function (a) { return a.$; }) : [Allow]) : undefined, AllowRegex: AllowRegex
|
|
143
152
|
? Array.isArray(AllowRegex)
|
|
144
|
-
? AllowRegex.map(function (a) { return a
|
|
153
|
+
? AllowRegex.map(function (a) { return a.$.pattern; })
|
|
145
154
|
: [AllowRegex.pattern]
|
|
146
155
|
: undefined }));
|
|
147
156
|
});
|
|
148
157
|
groups = [];
|
|
149
|
-
if (
|
|
150
|
-
if (Array.isArray(
|
|
151
|
-
groups =
|
|
158
|
+
if (parsedProgramJSON.Program.Definitions[0].Groups[0].Group) {
|
|
159
|
+
if (Array.isArray(parsedProgramJSON.Program.Definitions[0].Groups[0].Group))
|
|
160
|
+
groups = parsedProgramJSON.Program.Definitions[0].Groups[0].Group.map(function (a) { return a.$; });
|
|
152
161
|
else
|
|
153
|
-
groups = [
|
|
162
|
+
groups = [parsedProgramJSON.Program.Definitions[0].Groups[0].Group];
|
|
154
163
|
}
|
|
155
164
|
productsRaw = [];
|
|
156
|
-
if (
|
|
157
|
-
if (Array.isArray(
|
|
158
|
-
productsRaw =
|
|
165
|
+
if (parsedProgramJSON.Program.Definitions[0].Products[0].Product) {
|
|
166
|
+
if (Array.isArray(parsedProgramJSON.Program.Definitions[0].Products[0].Product))
|
|
167
|
+
productsRaw = parsedProgramJSON.Program.Definitions[0].Products[0].Product.map(function (a) { return a.$; });
|
|
159
168
|
else
|
|
160
|
-
productsRaw = [
|
|
169
|
+
productsRaw = [parsedProgramJSON.Program.Definitions[0].Products[0].Product];
|
|
161
170
|
}
|
|
162
171
|
xmlDom = new xmldom_1.default.DOMParser().parseFromString(rawXML);
|
|
163
172
|
products = _recursePaths(xmlDom, productsRaw, groups, collections);
|
|
164
173
|
return [2, Promise.resolve(new _1.Program({
|
|
165
|
-
name:
|
|
166
|
-
machineName:
|
|
174
|
+
name: parsedProgramJSON.Program.Name[0],
|
|
175
|
+
machineName: parsedProgramJSON.Program.MachineName[0],
|
|
167
176
|
projectXSDs: projectXSDs,
|
|
168
177
|
projectFile: projectFile,
|
|
169
178
|
meta: meta,
|
|
@@ -178,32 +187,33 @@ function parseProgramXML(rawXML) {
|
|
|
178
187
|
exports.parseProgramXML = parseProgramXML;
|
|
179
188
|
function parseProjectXML(rawXML) {
|
|
180
189
|
return __awaiter(this, void 0, void 0, function () {
|
|
181
|
-
var parsedProjectJSON,
|
|
190
|
+
var parsedProjectJSON, retVal, whMeta, meta;
|
|
182
191
|
return __generator(this, function (_a) {
|
|
183
192
|
switch (_a.label) {
|
|
184
|
-
case 0: return [4, xml2js_1.parseStringPromise(rawXML).catch(function (err) {
|
|
193
|
+
case 0: return [4, (0, xml2js_1.parseStringPromise)(rawXML).catch(function (err) {
|
|
185
194
|
throw new _1.ValidationError('Error parsing XML file. This likely means a broken or unclosed tag.', [err.message]);
|
|
186
195
|
})];
|
|
187
196
|
case 1:
|
|
188
197
|
parsedProjectJSON = _a.sent();
|
|
189
|
-
|
|
190
|
-
retVal = converted.Project;
|
|
198
|
+
retVal = parsedProjectJSON.Project;
|
|
191
199
|
whMeta = {};
|
|
192
200
|
if (retVal.Warehouse) {
|
|
193
|
-
whMeta =
|
|
201
|
+
whMeta = parseXMLMeta(retVal.Warehouse[0].Meta);
|
|
194
202
|
}
|
|
195
203
|
meta = {};
|
|
196
204
|
if (retVal.MetaData) {
|
|
197
|
-
meta =
|
|
205
|
+
meta = parseXMLMeta(retVal.MetaData[0].Meta);
|
|
198
206
|
}
|
|
199
207
|
return [2, Promise.resolve({
|
|
200
208
|
id: whMeta.id,
|
|
201
|
-
name: retVal.Name,
|
|
202
|
-
projType: retVal.ProjectType,
|
|
209
|
+
name: retVal.Name[0],
|
|
210
|
+
projType: retVal.ProjectType[0],
|
|
203
211
|
Warehouse: whMeta,
|
|
204
212
|
program: whMeta.program,
|
|
205
213
|
meta: meta,
|
|
206
214
|
tags: _1.Project.parseTagString(whMeta.tags),
|
|
215
|
+
xml: rawXML,
|
|
216
|
+
parsedProjectJSON: parsedProjectJSON,
|
|
207
217
|
rawXML: rawXML
|
|
208
218
|
})];
|
|
209
219
|
}
|
|
@@ -232,7 +242,7 @@ exports.augmentXML = augmentXML;
|
|
|
232
242
|
function verifyMeta(projType, projectMeta, program) {
|
|
233
243
|
var projectDef = program.products.find(function (p) { return p.id === projType; });
|
|
234
244
|
if (!projectDef) {
|
|
235
|
-
throw new Error("No project type '"
|
|
245
|
+
throw new Error("No project type '".concat(projType, "' found in program '").concat(program.name, "'"));
|
|
236
246
|
}
|
|
237
247
|
var collectionathArrs = projectDef.pathArr.filter(function (f) { return f.type === 'Collection'; });
|
|
238
248
|
return collectionathArrs.map(function (arrEl) { return ({
|
package/dist/xml.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xml.js","sourceRoot":"","sources":["../src/xml.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iCAA2C;AAC3C,gDAAyB;
|
|
1
|
+
{"version":3,"file":"xml.js","sourceRoot":"","sources":["../src/xml.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,13 +1,14 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@riverscapes/common",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.3.1",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"engines": {
|
|
7
|
-
"node": ">=
|
|
7
|
+
"node": ">=14.17.3 <15.0.0"
|
|
8
8
|
},
|
|
9
9
|
"scripts": {
|
|
10
10
|
"build": "tsc",
|
|
11
|
+
"build:gql": "npx ts-node ./scripts/buildGQL.ts",
|
|
11
12
|
"watch": "tsc --watch",
|
|
12
13
|
"lint": "tsc --noEmit && eslint src/**/* --fix",
|
|
13
14
|
"test": "jest --config ../../jest.config.js --rootDir src",
|
|
@@ -19,20 +20,20 @@
|
|
|
19
20
|
"author": "",
|
|
20
21
|
"license": "ISC",
|
|
21
22
|
"dependencies": {
|
|
22
|
-
"@northarrowresearch/common": "^1.x",
|
|
23
|
+
"@northarrowresearch/common": "^2.1.x",
|
|
23
24
|
"axios": "^0.21.1",
|
|
24
25
|
"filesize": "^5.0.3",
|
|
25
|
-
"graphql": "^
|
|
26
|
+
"graphql": "^15.5.0",
|
|
26
27
|
"graphql-tag": "^2.10.1",
|
|
27
|
-
"lodash": "^4.17.
|
|
28
|
-
"moment": "^2.
|
|
28
|
+
"lodash": "^4.17.21",
|
|
29
|
+
"moment": "^2.29.1",
|
|
29
30
|
"numeral": "^2.0.6",
|
|
30
31
|
"xml2js": "^0.4.22",
|
|
31
|
-
"xmldom": "^0.
|
|
32
|
+
"xmldom": "^0.6.0"
|
|
32
33
|
},
|
|
33
34
|
"devDependencies": {
|
|
34
|
-
"@riverscapes/mock": "^1.
|
|
35
|
-
"node-fetch": "^2.6.
|
|
35
|
+
"@riverscapes/mock": "^1.3.1",
|
|
36
|
+
"node-fetch": "^2.6.4"
|
|
36
37
|
},
|
|
37
|
-
"gitHead": "
|
|
38
|
+
"gitHead": "4128b6f52e75d2cdc0c116f4201b68cf31334281"
|
|
38
39
|
}
|