@takeshape/util 8.102.2 → 8.106.1

package/{lib → dist}/types.d.ts

@@ -25,4 +25,8 @@ export declare function isPrimitive(maybePrimitive: unknown): maybePrimitive is
 export declare type Scalar = string | number | boolean | bigint;
 export declare function isScalar(maybeScalar: unknown): maybeScalar is Scalar;
 export declare function getSingle<T>(t?: T | T[]): Maybe<T>;
+/**
+ * Test whether a provided string is numeric, e.g., '9' is numeric while 'nine' is not.
+ */
+export declare function isNumericString(key: string): boolean;
 //# sourceMappingURL=types.d.ts.map

package/{lib → dist}/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,WAAW,CAAC;AAIzC,oBAAY,WAAW,CAAC,GAAG,IAAI;KAAE,CAAC,IAAI,MAAM,QAAQ,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,SAAS,MAAM,GAAG,CAAC,GAAG,KAAK;CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;AAE1G;;;GAGG;AACH,wBAAgB,QAAQ,CAAC,WAAW,EAAE,OAAO,GAAG,WAAW,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAErF;AAED,oBAAY,SAAS,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AAG/E,oBAAY,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC;AAErC;;;GAGG;AACH,oBAAY,SAAS,CAAC,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;AAErE;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,CAAC,SAAS,MAAM,EAAE,KAAK,SAAS,MAAM,EAAE,YAAY,EAAE;KAAE,GAAG,IAAI,CAAC,GAAG,KAAK;CAAC,eACtF,MAAM,mCAC1B;AAED,wBAAgB,WAAW,CAAC,cAAc,EAAE,OAAO,GAAG,cAAc,IAAI,SAAS,CAUhF;AAED,oBAAY,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC;AAExD,wBAAgB,QAAQ,CAAC,WAAW,EAAE,OAAO,GAAG,WAAW,IAAI,MAAM,CAOpE;AAED,wBAAgB,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,CAMlD"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,WAAW,CAAC;AAIzC,oBAAY,WAAW,CAAC,GAAG,IAAI;KAAE,CAAC,IAAI,MAAM,QAAQ,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,SAAS,MAAM,GAAG,CAAC,GAAG,KAAK;CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;AAE1G;;;GAGG;AACH,wBAAgB,QAAQ,CAAC,WAAW,EAAE,OAAO,GAAG,WAAW,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAErF;AAED,oBAAY,SAAS,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AAG/E,oBAAY,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC;AAErC;;;GAGG;AACH,oBAAY,SAAS,CAAC,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;AAErE;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,CAAC,SAAS,MAAM,EAAE,KAAK,SAAS,MAAM,EAAE,YAAY,EAAE;KAAE,GAAG,IAAI,CAAC,GAAG,KAAK;CAAC,eACtF,MAAM,mCAC1B;AAED,wBAAgB,WAAW,CAAC,cAAc,EAAE,OAAO,GAAG,cAAc,IAAI,SAAS,CAUhF;AAED,oBAAY,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC;AAExD,wBAAgB,QAAQ,CAAC,WAAW,EAAE,OAAO,GAAG,WAAW,IAAI,MAAM,CAOpE;AAED,wBAAgB,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,CAMlD;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAEpD"}

package/{lib → dist}/types.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.createEnumMatcher = createEnumMatcher;
 exports.getSingle = getSingle;
+exports.isNumericString = isNumericString;
 exports.isPrimitive = isPrimitive;
 exports.isRecord = isRecord;
 exports.isScalar = isScalar;
@@ -45,4 +46,12 @@ function getSingle(t) {
   }
 
   return t;
+}
+/**
+ * Test whether a provided string is numeric, e.g., '9' is numeric while 'nine' is not.
+ */
+
+
+function isNumericString(key) {
+  return !isNaN(Number(key));
 }

package/dist/visit.d.ts

@@ -0,0 +1,10 @@
+/**
+ * Walk a tree, calling the callback for any property name matching a value in the keys array.
+ */
+export declare function visit<Tree extends Record<string, any>, Node>(tree: Tree, keys: string[], callback: (value: Node, path: string[]) => void): void;
+/**
+ * Walk a tree with JSONPath, calling the callback for matching properties.
+ * Normalizes the resulting path
+ */
+export declare function visitJsonPath<Tree extends Record<string, any>, Node>(tree: Tree, jsonPaths: string[], callback: (value: Node, path: string[], foundIndex: number) => void): void;
+//# sourceMappingURL=visit.d.ts.map

package/dist/visit.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"visit.d.ts","sourceRoot":"","sources":["../../src/visit.ts"],"names":[],"mappings":"AAIA;;GAEG;AACH,wBAAgB,KAAK,CAAC,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,IAAI,EAC1D,IAAI,EAAE,IAAI,EACV,IAAI,EAAE,MAAM,EAAE,EACd,QAAQ,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,IAAI,QAehD;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,IAAI,EAClE,IAAI,EAAE,IAAI,EACV,SAAS,EAAE,MAAM,EAAE,EACnB,QAAQ,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,UAAU,EAAE,MAAM,KAAK,IAAI,QA0CpE"}

package/dist/visit.js

@@ -0,0 +1,75 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.visit = visit;
+exports.visitJsonPath = visitJsonPath;
+
+var _isObject = _interopRequireDefault(require("lodash/isObject"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+/**
+ * Walk a tree, calling the callback for any property name matching a value in the keys array.
+ */
+function visit(tree, keys, callback) {
+  const traverse = (obj, path) => {
+    for (const [key, value] of Object.entries(obj)) {
+      if (keys.includes(key)) {
+        callback(value, [...path, key]);
+      }
+
+      if ((0, _isObject.default)(value)) {
+        traverse(value, [...path, key]);
+      }
+    }
+  };
+
+  traverse(tree, []);
+}
+/**
+ * Walk a tree with JSONPath, calling the callback for matching properties.
+ * Normalizes the resulting path
+ */
+
+
+function visitJsonPath(tree, jsonPaths, callback) {
+  const paths = jsonPaths.map(p => p.split('.').slice());
+
+  const testPaths = propPath => {
+    return paths.findIndex(testPath => {
+      const isFromRoot = testPath[0] === '$';
+      const tPath = isFromRoot ? testPath.slice(1) : testPath.slice().reverse();
+      const pPath = isFromRoot ? propPath.slice() : propPath.slice().reverse();
+      let isMatchingPath = isFromRoot ? tPath.length === pPath.length : tPath.length <= pPath.length;
+
+      for (const [pI, pP] of pPath.entries()) {
+        if (tPath[pI] === undefined || !isMatchingPath) {
+          break;
+        }
+
+        isMatchingPath = pP === tPath[pI] || tPath[pI] === '*';
+      }
+
+      return isMatchingPath;
+    });
+  };
+
+  const traverse = (obj, path) => {
+    for (const [prop, value] of Object.entries(obj)) {
+      const propPath = [...path, prop];
+      const foundIndex = testPaths(propPath);
+
+      if (foundIndex > -1) {
+        callback(value, propPath, foundIndex);
+      }
+
+      if ((0, _isObject.default)(value)) {
+        traverse(value, propPath);
+      }
+    }
+  };
+
+  traverse(tree, []);
+}

package/es/types.js

@@ -28,4 +28,11 @@ export function getSingle(t) {
   }
 
   return t;
+}
+/**
+ * Test whether a provided string is numeric, e.g., '9' is numeric while 'nine' is not.
+ */
+
+export function isNumericString(key) {
+  return !isNaN(Number(key));
 }

package/es/visit.js

@@ -16,5 +16,49 @@ export function visit(tree, keys, callback) {
     }
   };
 
+  traverse(tree, []);
+}
+/**
+ * Walk a tree with JSONPath, calling the callback for matching properties.
+ * Normalizes the resulting path
+ */
+
+export function visitJsonPath(tree, jsonPaths, callback) {
+  const paths = jsonPaths.map(p => p.split('.').slice());
+
+  const testPaths = propPath => {
+    return paths.findIndex(testPath => {
+      const isFromRoot = testPath[0] === '$';
+      const tPath = isFromRoot ? testPath.slice(1) : testPath.slice().reverse();
+      const pPath = isFromRoot ? propPath.slice() : propPath.slice().reverse();
+      let isMatchingPath = isFromRoot ? tPath.length === pPath.length : tPath.length <= pPath.length;
+
+      for (const [pI, pP] of pPath.entries()) {
+        if (tPath[pI] === undefined || !isMatchingPath) {
+          break;
+        }
+
+        isMatchingPath = pP === tPath[pI] || tPath[pI] === '*';
+      }
+
+      return isMatchingPath;
+    });
+  };
+
+  const traverse = (obj, path) => {
+    for (const [prop, value] of Object.entries(obj)) {
+      const propPath = [...path, prop];
+      const foundIndex = testPaths(propPath);
+
+      if (foundIndex > -1) {
+        callback(value, propPath, foundIndex);
+      }
+
+      if (isObject(value)) {
+        traverse(value, propPath);
+      }
+    }
+  };
+
   traverse(tree, []);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takeshape/util",
-  "version": "8.102.2",
+  "version": "8.106.1",
   "description": "Shared utilities",
   "homepage": "https://www.takeshape.io",
   "repository": {
@@ -12,16 +12,16 @@
   "engines": {
     "node": ">=14"
   },
-  "main": "lib/index.js",
+  "main": "dist/index.js",
   "module": "es/index.js",
   "browser": "es/browser.js",
-  "types": "lib/index.d.ts",
+  "types": "dist/index.d.ts",
   "files": [
-    "lib",
+    "dist",
     "es"
   ],
   "dependencies": {
-    "@takeshape/routing": "8.102.2",
+    "@takeshape/routing": "8.106.1",
     "@types/url-parse": "^1.4.4",
     "aws-sdk": "^2.802.0",
     "classnames": "^2.2.5",
@@ -50,12 +50,12 @@
     "test-changed": "pnpm run test -- --changedSince=master",
     "test:ci": "JEST_JUNIT_OUTPUT_DIR=\"${HOME}/test-results/${npm_package_name#*\\/}\" JEST_JUNIT_OUTPUT_NAME=jest-results.xml jest --ci --reporters=default --reporters=jest-junit",
     "typecheck": "tsc --noEmit",
-    "clean": "rimraf lib es build *.tsbuildinfo",
+    "clean": "rimraf dist es build *.tsbuildinfo",
     "build": "pnpm build:types && pnpm build:js && pnpm build:es && pnpm build:copy",
     "build:types": "tsc --emitDeclarationOnly --project tsconfig.build.json",
-    "build:js": "cross-env BABEL_MODULES=commonjs babel src --out-dir lib --extensions \".js,.ts\" --ignore '**/__tests__'",
+    "build:js": "cross-env BABEL_MODULES=commonjs babel src --out-dir dist --extensions \".js,.ts\" --ignore '**/__tests__'",
     "build:es": "cross-env BABEL_MODULES=es babel src --out-dir es --extensions \".js,.ts\" --ignore '**/__tests__'",
-    "build:copy": "cp -rf build/src/* lib/",
+    "build:copy": "cp -rf build/src/* dist/",
     "will-it-blend": "pnpm typecheck && pnpm lint -- --quiet && pnpm test -- --silent --coverage false",
     "todo": "leasot 'src/**/*.{js,jsx,ts,tsx}'"
   },

package/lib/visit.d.ts

@@ -1,5 +0,0 @@
-/**
- * Walk a tree, calling the callback for any property name matching a value in the keys array.
- */
-export declare function visit<Tree extends Record<string, any>, Node>(tree: Tree, keys: string[], callback: (value: Node, path: string[]) => void): void;
-//# sourceMappingURL=visit.d.ts.map

package/lib/visit.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"visit.d.ts","sourceRoot":"","sources":["../../src/visit.ts"],"names":[],"mappings":"AAIA;;GAEG;AACH,wBAAgB,KAAK,CAAC,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,IAAI,EAC1D,IAAI,EAAE,IAAI,EACV,IAAI,EAAE,MAAM,EAAE,EACd,QAAQ,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,IAAI,QAehD"}

package/lib/visit.js

@@ -1,29 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.visit = visit;
-
-var _isObject = _interopRequireDefault(require("lodash/isObject"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-/**
- * Walk a tree, calling the callback for any property name matching a value in the keys array.
- */
-function visit(tree, keys, callback) {
-  const traverse = (obj, path) => {
-    for (const [key, value] of Object.entries(obj)) {
-      if (keys.includes(key)) {
-        callback(value, [...path, key]);
-      }
-
-      if ((0, _isObject.default)(value)) {
-        traverse(value, [...path, key]);
-      }
-    }
-  };
-
-  traverse(tree, []);
-}