@riverscapes/common 2.0.21 → 2.0.22

package/dist_esnext/lib/util.js

@@ -0,0 +1,43 @@
+import { isNull } from 'lodash';
+export function padString(padChar, totalLength, str, padLeft) {
+    if (padLeft === void 0) { padLeft = false; }
+    var pad = totalLength > str.length ? padChar.repeat(2 + totalLength - str.length) : '';
+    if (padLeft) {
+        return (pad + str).slice(-totalLength);
+    }
+    else {
+        return (str + pad).substring(0, totalLength);
+    }
+}
+export var isNumeric = function (num) {
+    try {
+        if (isNull(num))
+            return false;
+        if (typeof num === 'number')
+            return !isNaN(num);
+        return !isNaN(Number(num)) && isFinite(Number(num));
+    }
+    catch (e) {
+        return false;
+    }
+};
+export function compareUrls(url1Str, url2Str) {
+    try {
+        var url1 = new URL(url1Str);
+        var url2 = new URL(url2Str);
+        var path1 = url1.pathname.replace(/\/$/, '');
+        var path2 = url2.pathname.replace(/\/$/, '');
+        return url1.origin === url2.origin && url1.port === url2.port && path1 === path2;
+    }
+    catch (_a) {
+        return false;
+    }
+}
+export function jsonToBase64(json) {
+    var jsonString = JSON.stringify(json);
+    return Buffer.from(jsonString).toString('base64');
+}
+export function base64ToJson(base64) {
+    return JSON.parse(Buffer.from(base64, 'base64').toString());
+}
+//# sourceMappingURL=util.js.map

package/dist_esnext/lib/util.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/lib/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAW/B,MAAM,UAAU,SAAS,CAAC,OAAe,EAAE,WAAmB,EAAE,GAAW,EAAE,OAAe;IAAf,wBAAA,EAAA,eAAe;IAC1F,IAAM,GAAG,GAAG,WAAW,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,WAAW,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;IACxF,IAAI,OAAO,EAAE;QACX,OAAO,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,WAAW,CAAC,CAAA;KACvC;SAAM;QACL,OAAO,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,WAAW,CAAC,CAAA;KAC7C;AACH,CAAC;AAOD,MAAM,CAAC,IAAM,SAAS,GAAG,UAAC,GAAY;IACpC,IAAI;QACF,IAAI,MAAM,CAAC,GAAG,CAAC;YAAE,OAAO,KAAK,CAAA;QAC7B,IAAI,OAAO,GAAG,KAAK,QAAQ;YAAE,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QAC/C,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAA;KACpD;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,KAAK,CAAA;KACb;AACH,CAAC,CAAA;AAQD,MAAM,UAAU,WAAW,CAAC,OAAe,EAAE,OAAe;IAC1D,IAAI;QACF,IAAM,IAAI,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAA;QAC7B,IAAM,IAAI,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAA;QAC7B,IAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;QAC9C,IAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;QAC9C,OAAO,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,IAAI,KAAK,KAAK,KAAK,CAAA;KACjF;IAAC,WAAM;QACN,OAAO,KAAK,CAAA;KACb;AACH,CAAC;AAMD,MAAM,UAAU,YAAY,CAAC,IAAY;IACvC,IAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;IACvC,OAAO,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;AACnD,CAAC;AAKD,MAAM,UAAU,YAAY,CAAC,MAAc;IACzC,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAA;AAC7D,CAAC"}

package/dist_esnext/lib/xml.d.ts

@@ -0,0 +1,6 @@
+import { MetaDataInput } from '../gen/schema.types';
+export declare const getMetaFromNode: (nodeWithMeta: Node) => MetaDataInput[];
+export declare const getChildNodeText: (tagName: string, parentNode: Node) => string | null;
+export declare const getNodeText: (parentNode: Node) => string | null;
+export declare const getChildNodeAttr: (node: Element, attrName: string, allowNull?: boolean) => string | null;
+export declare const getNodeAttrDict: (node: Element) => Record<string, string>;

package/dist_esnext/lib/xml.js

@@ -0,0 +1,89 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+import xpath from 'xpath';
+import { MetaDataExtEnum, MetaDataTypeEnum } from '../gen/schema.types';
+import log from 'loglevel';
+export var getMetaFromNode = function (nodeWithMeta) {
+    try {
+        var metaNodes = xpath.select('MetaData/Meta', nodeWithMeta);
+        var keyCheck_1 = [];
+        var metaInputs = metaNodes.map(function (nd) {
+            var rawType = nd.getAttribute('type');
+            var rawLocked = nd.getAttribute('locked');
+            var rawExt = nd.getAttribute('ext');
+            var typeVal;
+            if (rawType && Object.values(MetaDataTypeEnum).includes(rawType.trim()))
+                throw new Error("MetaDataType not found: ".concat(rawType));
+            else if (rawType)
+                typeVal = rawType.trim().toUpperCase();
+            var lockedVal = false;
+            if (rawLocked && rawLocked.trim().toLowerCase() !== 'true' && rawLocked.trim().toLowerCase() !== 'false')
+                throw new Error("locked is not either 'true' or 'false' got: \"".concat(rawLocked, "\""));
+            else if (rawLocked && rawLocked.trim().toLowerCase() === 'true')
+                lockedVal = true;
+            var extVal;
+            if (rawExt && rawExt.trim().length > 0) {
+                var lwrExt = rawExt.trim().toUpperCase();
+                if (lwrExt && Object.values(MetaDataExtEnum).includes(rawExt.trim()))
+                    throw new Error("MetaDataExtEnum not found: ".concat(rawExt));
+                else if (rawExt)
+                    extVal = rawExt.trim().toUpperCase();
+            }
+            var key = nd.getAttribute('name');
+            if (!key)
+                throw new Error('Error retriving name from XML node');
+            if (keyCheck_1.includes(key))
+                throw new Error("Duplicate key found: ".concat(key));
+            keyCheck_1.push(key);
+            return {
+                key: key,
+                type: typeVal,
+                value: nd.textContent.trim(),
+                locked: lockedVal,
+                ext: extVal,
+            };
+        });
+        return metaInputs;
+    }
+    catch (e) {
+        if (e.message.includes('Duplicate key found'))
+            throw e;
+        if (e.message.includes('Error retriving name'))
+            throw e;
+        log.warn('Could not find MetaData element in XML');
+        return [];
+    }
+};
+export var getChildNodeText = function (tagName, parentNode) {
+    var tagNode = xpath.select1(tagName, parentNode);
+    if (!tagNode)
+        return null;
+    return tagNode.textContent.trim();
+};
+export var getNodeText = function (parentNode) {
+    return parentNode.textContent.trim();
+};
+export var getChildNodeAttr = function (node, attrName, allowNull) {
+    if (allowNull === void 0) { allowNull = true; }
+    var id = node.getAttribute(attrName);
+    if (!id && !allowNull)
+        throw new Error('Error retriving id from XML node');
+    return id.length > 0 ? id : null;
+};
+export var getNodeAttrDict = function (node) {
+    return Array.from(node.attributes).reduce(function (acc, _a) {
+        var _b;
+        var name = _a.name, value = _a.value;
+        return (__assign(__assign({}, acc), (_b = {}, _b[name] = value, _b)));
+    }, {});
+};
+//# sourceMappingURL=xml.js.map

package/dist_esnext/lib/xml.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"xml.js","sourceRoot":"","sources":["../../src/lib/xml.ts"],"names":[],"mappings":"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"}

package/dist_esnext/types.d.ts

@@ -0,0 +1,71 @@
+import { DatasetContainerTypesEnum, DatasetTypeEnum, ProjectTreeBranch, ProjectTreeLayerTypeEnum, ProjectTreeLeaf, ProjectTreeView } from './gen/schema.types';
+export type JSONObject = string | number | boolean | {
+    [x: string]: JSONObject;
+} | Array<JSONObject>;
+type ObjectValues<T> = T[keyof T];
+export type RSXPath = {
+    datasetContainer: DatasetContainerTypesEnum;
+    datasetType: DatasetTypeEnum;
+    datasetXMLId: string;
+    realizationXMLId?: string;
+    analysisId?: string;
+};
+export type WarehouseEl = {
+    id: string;
+    ref?: string;
+    apiUrl: string;
+};
+export interface BusinessLogicInterface {
+    name: string;
+    description?: string;
+    projectType: string;
+    node: BusinessLogicNode;
+    defaultView?: string;
+    views?: ProjectTreeView[];
+    leaves?: any;
+    branches?: any;
+}
+export type ProjectBLTree = BusinessLogicInterface & {
+    leaves: ProjectTreeLeaf[];
+    branches: ProjectTreeBranch[];
+};
+export type FileParts = {
+    ext: string;
+    pathNoExt: string;
+    pathLower: string;
+    extLower: string;
+};
+export type BusinessLogicNode = {
+    id?: string;
+    datatype?: ProjectTreeLayerTypeEnum;
+    symbology?: string;
+    transparency?: number;
+    label?: string;
+    xpath?: string;
+    xpathlabel?: string;
+    tileservice?: string;
+    isRepeater?: boolean;
+    collapsed?: boolean;
+    children?: BusinessLogicNode[];
+};
+export declare const SQSJobEngineEnum: {
+    readonly TILERIZER: "TILERIZER";
+    readonly JANITOR: "JANITOR";
+    readonly ZIPPER: "ZIPPER";
+};
+export type SQSJobEngineEnum = ObjectValues<typeof SQSJobEngineEnum>;
+export type SQSJob = {
+    engine: SQSJobEngineEnum;
+    projectId: string;
+    projectType: string | null;
+    key: string;
+    etag?: string;
+    rsXPath?: string;
+    ReceiptHandle?: string;
+    queueUrl?: string;
+};
+export type SQSQueueJobsResponse = {
+    successful: SQSJob[];
+    failed: SQSJob[];
+};
+export {};

package/dist_esnext/types.js

@@ -0,0 +1,6 @@
+export var SQSJobEngineEnum = {
+    TILERIZER: 'TILERIZER',
+    JANITOR: 'JANITOR',
+    ZIPPER: 'ZIPPER',
+};
+//# sourceMappingURL=types.js.map

package/dist_esnext/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAuEA,MAAM,CAAC,IAAM,gBAAgB,GAAG;IAC9B,SAAS,EAAE,WAAW;IACtB,OAAO,EAAE,SAAS;IAClB,MAAM,EAAE,QAAQ;CACR,CAAA"}

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "@riverscapes/common",
-  "version": "2.0.21",
+  "version": "2.0.22",
   "description": "Common elements to all riverscapes tools (client and server)",
   "main": "dist/index.js",
+  "module": "dist_esnext/index.js",
   "engines": {
     "node": ">=14.17.3 <19"
   },
@@ -10,7 +11,7 @@
     "access": "public"
   },
   "scripts": {
-    "build": "yarn build:gql;tsc;",
+    "build": "yarn build:gql && tsc -p tsconfig.json && tsc -p tsconfig.esnext.json",
     "watch": "tsc --watch",
     "build:gql": "graphql-codegen --config codegen.yml",
     "watch:gql": "graphql-codegen --watch src/*.gql --config codegen.yml",
@@ -24,21 +25,21 @@
     "@mapbox/geojson-extent": "^1.0.1",
     "@mapbox/geojson-normalize": "^0.0.1",
     "@xmldom/xmldom": "^0.8.2",
-    "graphql-scalars": "^1.17.0",
-    "graphql-tag": "^2.10.1",
+    "graphql-scalars": "^1.23.0",
+    "graphql-tag": "^2.12.6",
     "ngeohash": "^0.6.3"
   },
   "devDependencies": {
-    "@graphql-codegen/cli": "*",
-    "@graphql-codegen/introspection": "*",
-    "@graphql-codegen/named-operations-object": "*",
-    "@graphql-codegen/typescript": "*",
-    "@graphql-codegen/typescript-document-nodes": "*",
-    "@graphql-codegen/typescript-resolvers": "*",
-    "graphql": "^16.4.0",
-    "jest": "*",
-    "ts-jest": "*",
-    "typescript": "*"
+    "@graphql-codegen/cli": "^5.0.2",
+    "@graphql-codegen/introspection": "^4.0.3",
+    "@graphql-codegen/named-operations-object": "^3.1.0",
+    "@graphql-codegen/typescript": "^4.0.9",
+    "@graphql-codegen/typescript-document-nodes": "^4.0.9",
+    "@graphql-codegen/typescript-resolvers": "^4.2.1",
+    "graphql": "^16.9.0",
+    "jest": "^29.7.0",
+    "ts-jest": "^29.2.3",
+    "typescript": "^4.7.2"
   },
-  "gitHead": "9052338b9157b8e78dd17203d5f272441d2861a9"
+  "gitHead": "d4a50db8b03aa252b7945ffae5f0bbc8391d82ef"
 }

package/tsconfig.esnext.json

@@ -0,0 +1,9 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "module": "esnext",
+    "outDir": "./dist_esnext"  },
+  "include": [
+    "./src"
+  ],
+ }