@bessemer/cornerstone 0.5.67 → 0.5.69

package/dist/object-path.d.ts

@@ -6,5 +6,6 @@ export declare const Schema: ZodType<ObjectPath>;
 export declare const of: (value: Array<string | number>) => ObjectPath;
 export declare const fromString: (path: string) => ObjectPath;
 export declare const getValue: (object: UnknownRecord, path: ObjectPath) => unknown;
+export declare const findValue: (object: UnknownRecord, path: ObjectPath) => unknown | undefined;
 export declare const applyValue: (object: UnknownRecord, path: ObjectPath, valueToApply: unknown) => unknown;
 //# sourceMappingURL=object-path.d.ts.map

package/dist/object-path.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"object-path.d.ts","sourceRoot":"","sources":["../src/object-path.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAA;AACxD,OAAY,EAAE,OAAO,EAAE,MAAM,KAAK,CAAA;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AAQzC,MAAM,MAAM,UAAU,GAAG,UAAU,CAAC,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,YAAY,CAAC,CAAA;AACzE,eAAO,MAAM,MAAM,EAAE,OAAO,CAAC,UAAU,CAA6D,CAAA;AAEpG,eAAO,MAAM,EAAE,GAAI,OAAO,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,KAAG,UAElD,CAAA;AAKD,eAAO,MAAM,UAAU,GAAI,MAAM,MAAM,KAAG,UAezC,CAAA;AAED,eAAO,MAAM,QAAQ,GAAI,QAAQ,aAAa,EAAE,MAAM,UAAU,KAAG,OAOlE,CAAA;AAED,eAAO,MAAM,UAAU,GAAI,QAAQ,aAAa,EAAE,MAAM,UAAU,EAAE,cAAc,OAAO,KAAG,OAc3F,CAAA"}
+{"version":3,"file":"object-path.d.ts","sourceRoot":"","sources":["../src/object-path.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAA;AACxD,OAAY,EAAE,OAAO,EAAE,MAAM,KAAK,CAAA;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AASzC,MAAM,MAAM,UAAU,GAAG,UAAU,CAAC,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,YAAY,CAAC,CAAA;AACzE,eAAO,MAAM,MAAM,EAAE,OAAO,CAAC,UAAU,CAA6D,CAAA;AAEpG,eAAO,MAAM,EAAE,GAAI,OAAO,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,KAAG,UAElD,CAAA;AAKD,eAAO,MAAM,UAAU,GAAI,MAAM,MAAM,KAAG,UAoBzC,CAAA;AAED,eAAO,MAAM,QAAQ,GAAI,QAAQ,aAAa,EAAE,MAAM,UAAU,KAAG,OAQlE,CAAA;AAED,eAAO,MAAM,SAAS,GAAI,QAAQ,aAAa,EAAE,MAAM,UAAU,KAAG,OAAO,GAAG,SAQ7E,CAAA;AAED,eAAO,MAAM,UAAU,GAAI,QAAQ,aAAa,EAAE,MAAM,UAAU,EAAE,cAAc,OAAO,KAAG,OAc3F,CAAA"}

package/dist/object-path.js

@@ -6,12 +6,13 @@ import { isNumber } from "@bessemer/cornerstone/math";
 import { isString } from "@bessemer/cornerstone/string";
 import { assert } from "@bessemer/cornerstone/assertion";
 import { isEmpty } from "@bessemer/cornerstone/array";
+import { failure, success } from "@bessemer/cornerstone/result";
 var Schema = Zod.array(Zod.union([Zod.string(), Zod.number()]));
 var of = (value) => {
   return value;
 };
-var ObjectPathRegex = /^[a-zA-Z_$][a-zA-Z0-9_$]*(?:\.[a-zA-Z_$][a-zA-Z0-9_$]*|\[\d+])*$/;
-var ObjectPathPartRegex = /([^.\[\]]+)|\[(\d+)]/g;
+var ObjectPathRegex = /^[a-zA-Z_$][a-zA-Z0-9_$]*(?:\.[a-zA-Z_$][a-zA-Z0-9_$]*|\.\d+|\[\d+])*$/;
+var ObjectPathPartRegex = /([a-zA-Z_$][a-zA-Z0-9_$]*)|\[(\d+)]|\.(\d+)/g;
 var fromString = (path) => {
   assert(ObjectPathRegex.test(path), () => `Unable to parse ObjectPath from string: ${path}`);
   const result = [];
@@ -21,16 +22,27 @@ var fromString = (path) => {
       result.push(match[1]);
     } else if (match[2] !== void 0) {
       result.push(Number(match[2]));
+    } else if (match[3] !== void 0) {
+      result.push(Number(match[3]));
     }
   }
   return of(result);
 };
 var getValue = (object, path) => {
-  let value = object;
-  for (const key of path) {
-    value = getIndexValueOrThrow(value, key, object, path);
+  const result = getValueResult(object, path);
+  if (result.isSuccess) {
+    return result.value;
+  } else {
+    throw new Error(`Unable to resolve ObjectPath: ${path} against record: ${JSON.stringify(object)}`);
+  }
+};
+var findValue = (object, path) => {
+  const result = getValueResult(object, path);
+  if (result.isSuccess) {
+    return result.value;
+  } else {
+    return void 0;
   }
-  return value;
 };
 var applyValue = (object, path, valueToApply) => {
   if (isEmpty(path)) {
@@ -44,20 +56,24 @@ var applyValue = (object, path, valueToApply) => {
     parent[last] = valueToApply;
   });
 };
-var getIndexValueOrThrow = (value, key, object, path) => {
-  if (isNumber(key) && Array.isArray(value)) {
-    if (key < 0 || key >= value.length) {
-      throw new Error(`Unable to resolve ObjectPath: ${path} against record: ${JSON.stringify(object)}`);
-    }
-    return value[key];
-  } else if (isString(key) && isObject(value)) {
-    if (!(key in value)) {
-      throw new Error(`Unable to resolve ObjectPath: ${path} against record: ${JSON.stringify(object)}`);
+var getValueResult = (object, path) => {
+  let value = object;
+  for (const key of path) {
+    if (isNumber(key) && Array.isArray(value)) {
+      if (key < 0 || key >= value.length) {
+        return failure();
+      }
+      value = value[key];
+    } else if (isString(key) && isObject(value)) {
+      if (!(key in value)) {
+        return failure();
+      }
+      value = value[key];
+    } else {
+      return failure();
     }
-    return value[key];
-  } else {
-    throw new Error(`Unable to resolve ObjectPath: ${path} against record: ${JSON.stringify(object)}`);
   }
+  return success(value);
 };
 var assertLegalIndex = (value, key, object, path) => {
   if (isNumber(key) && Array.isArray(value)) {
@@ -71,6 +87,7 @@ var assertLegalIndex = (value, key, object, path) => {
 export {
   Schema,
   applyValue,
+  findValue,
   fromString,
   getValue,
   of

package/dist/object-path.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/object-path.ts"],"sourcesContent":["import { TaggedType } from '@bessemer/cornerstone/types'\nimport Zod, { ZodType } from 'zod'\nimport { UnknownRecord } from 'type-fest'\nimport { isObject } from '@bessemer/cornerstone/object'\nimport { produce } from 'immer'\nimport { isNumber } from '@bessemer/cornerstone/math'\nimport { isString } from '@bessemer/cornerstone/string'\nimport { assert } from '@bessemer/cornerstone/assertion'\nimport { isEmpty } from '@bessemer/cornerstone/array'\n\nexport type ObjectPath = TaggedType<Array<string | number>, 'ObjectPath'>\nexport const Schema: ZodType<ObjectPath> = Zod.array(Zod.union([Zod.string(), Zod.number()])) as any\n\nexport const of = (value: Array<string | number>): ObjectPath => {\n  return value as ObjectPath\n}\n\nconst ObjectPathRegex = /^[a-zA-Z_$][a-zA-Z0-9_$]*(?:\\.[a-zA-Z_$][a-zA-Z0-9_$]*|\\[\\d+])*$/\nconst ObjectPathPartRegex = /([^.\\[\\]]+)|\\[(\\d+)]/g\n\nexport const fromString = (path: string): ObjectPath => {\n  assert(ObjectPathRegex.test(path), () => `Unable to parse ObjectPath from string: ${path}`)\n\n  const result: Array<string | number> = []\n\n  let match: RegExpExecArray | null\n  while ((match = ObjectPathPartRegex.exec(path)) !== null) {\n    if (match[1] !== undefined) {\n      result.push(match[1])\n    } else if (match[2] !== undefined) {\n      result.push(Number(match[2]))\n    }\n  }\n\n  return of(result)\n}\n\nexport const getValue = (object: UnknownRecord, path: ObjectPath): unknown => {\n  let value: any = object\n  for (const key of path) {\n    value = getIndexValueOrThrow(value, key, object, path)\n  }\n\n  return value\n}\n\nexport const applyValue = (object: UnknownRecord, path: ObjectPath, valueToApply: unknown): unknown => {\n  if (isEmpty(path)) {\n    return valueToApply\n  }\n\n  return produce(object, (draft) => {\n    const rest = path.slice(0, -1)\n    const last = path[path.length - 1]!\n    const parent: any = isEmpty(rest) ? draft : getValue(draft, of(rest))\n\n    // Check to make sure the last index is ok\n    assertLegalIndex(parent, last, object, path)\n    parent[last] = valueToApply\n  })\n}\n\nconst getIndexValueOrThrow = (value: any, key: string | number, object: UnknownRecord, path: ObjectPath): any => {\n  if (isNumber(key) && Array.isArray(value)) {\n    if (key < 0 || key >= value.length) {\n      throw new Error(`Unable to resolve ObjectPath: ${path} against record: ${JSON.stringify(object)}`)\n    }\n\n    return value[key]\n  } else if (isString(key) && isObject(value)) {\n    if (!(key in value)) {\n      throw new Error(`Unable to resolve ObjectPath: ${path} against record: ${JSON.stringify(object)}`)\n    }\n\n    return value[key]\n  } else {\n    throw new Error(`Unable to resolve ObjectPath: ${path} against record: ${JSON.stringify(object)}`)\n  }\n}\n\nconst assertLegalIndex = (value: any, key: string | number, object: UnknownRecord, path: ObjectPath): void => {\n  if (isNumber(key) && Array.isArray(value)) {\n    return\n  } else if (isString(key) && isObject(value)) {\n    return\n  } else {\n    throw new Error(`Unable to resolve ObjectPath: ${path} against record: ${JSON.stringify(object)}`)\n  }\n}\n"],"mappings":";AACA,OAAO,SAAsB;AAE7B,SAAS,gBAAgB;AACzB,SAAS,eAAe;AACxB,SAAS,gBAAgB;AACzB,SAAS,gBAAgB;AACzB,SAAS,cAAc;AACvB,SAAS,eAAe;AAGjB,IAAM,SAA8B,IAAI,MAAM,IAAI,MAAM,CAAC,IAAI,OAAO,GAAG,IAAI,OAAO,CAAC,CAAC,CAAC;AAErF,IAAM,KAAK,CAAC,UAA8C;AAC/D,SAAO;AACT;AAEA,IAAM,kBAAkB;AACxB,IAAM,sBAAsB;AAErB,IAAM,aAAa,CAAC,SAA6B;AACtD,SAAO,gBAAgB,KAAK,IAAI,GAAG,MAAM,2CAA2C,IAAI,EAAE;AAE1F,QAAM,SAAiC,CAAC;AAExC,MAAI;AACJ,UAAQ,QAAQ,oBAAoB,KAAK,IAAI,OAAO,MAAM;AACxD,QAAI,MAAM,CAAC,MAAM,QAAW;AAC1B,aAAO,KAAK,MAAM,CAAC,CAAC;AAAA,IACtB,WAAW,MAAM,CAAC,MAAM,QAAW;AACjC,aAAO,KAAK,OAAO,MAAM,CAAC,CAAC,CAAC;AAAA,IAC9B;AAAA,EACF;AAEA,SAAO,GAAG,MAAM;AAClB;AAEO,IAAM,WAAW,CAAC,QAAuB,SAA8B;AAC5E,MAAI,QAAa;AACjB,aAAW,OAAO,MAAM;AACtB,YAAQ,qBAAqB,OAAO,KAAK,QAAQ,IAAI;AAAA,EACvD;AAEA,SAAO;AACT;AAEO,IAAM,aAAa,CAAC,QAAuB,MAAkB,iBAAmC;AACrG,MAAI,QAAQ,IAAI,GAAG;AACjB,WAAO;AAAA,EACT;AAEA,SAAO,QAAQ,QAAQ,CAAC,UAAU;AAChC,UAAM,OAAO,KAAK,MAAM,GAAG,EAAE;AAC7B,UAAM,OAAO,KAAK,KAAK,SAAS,CAAC;AACjC,UAAM,SAAc,QAAQ,IAAI,IAAI,QAAQ,SAAS,OAAO,GAAG,IAAI,CAAC;AAGpE,qBAAiB,QAAQ,MAAM,QAAQ,IAAI;AAC3C,WAAO,IAAI,IAAI;AAAA,EACjB,CAAC;AACH;AAEA,IAAM,uBAAuB,CAAC,OAAY,KAAsB,QAAuB,SAA0B;AAC/G,MAAI,SAAS,GAAG,KAAK,MAAM,QAAQ,KAAK,GAAG;AACzC,QAAI,MAAM,KAAK,OAAO,MAAM,QAAQ;AAClC,YAAM,IAAI,MAAM,iCAAiC,IAAI,oBAAoB,KAAK,UAAU,MAAM,CAAC,EAAE;AAAA,IACnG;AAEA,WAAO,MAAM,GAAG;AAAA,EAClB,WAAW,SAAS,GAAG,KAAK,SAAS,KAAK,GAAG;AAC3C,QAAI,EAAE,OAAO,QAAQ;AACnB,YAAM,IAAI,MAAM,iCAAiC,IAAI,oBAAoB,KAAK,UAAU,MAAM,CAAC,EAAE;AAAA,IACnG;AAEA,WAAO,MAAM,GAAG;AAAA,EAClB,OAAO;AACL,UAAM,IAAI,MAAM,iCAAiC,IAAI,oBAAoB,KAAK,UAAU,MAAM,CAAC,EAAE;AAAA,EACnG;AACF;AAEA,IAAM,mBAAmB,CAAC,OAAY,KAAsB,QAAuB,SAA2B;AAC5G,MAAI,SAAS,GAAG,KAAK,MAAM,QAAQ,KAAK,GAAG;AACzC;AAAA,EACF,WAAW,SAAS,GAAG,KAAK,SAAS,KAAK,GAAG;AAC3C;AAAA,EACF,OAAO;AACL,UAAM,IAAI,MAAM,iCAAiC,IAAI,oBAAoB,KAAK,UAAU,MAAM,CAAC,EAAE;AAAA,EACnG;AACF;","names":[]}
+{"version":3,"sources":["../src/object-path.ts"],"sourcesContent":["import { TaggedType } from '@bessemer/cornerstone/types'\nimport Zod, { ZodType } from 'zod'\nimport { UnknownRecord } from 'type-fest'\nimport { isObject } from '@bessemer/cornerstone/object'\nimport { produce } from 'immer'\nimport { isNumber } from '@bessemer/cornerstone/math'\nimport { isString } from '@bessemer/cornerstone/string'\nimport { assert } from '@bessemer/cornerstone/assertion'\nimport { isEmpty } from '@bessemer/cornerstone/array'\nimport { failure, Result, success } from '@bessemer/cornerstone/result'\n\nexport type ObjectPath = TaggedType<Array<string | number>, 'ObjectPath'>\nexport const Schema: ZodType<ObjectPath> = Zod.array(Zod.union([Zod.string(), Zod.number()])) as any\n\nexport const of = (value: Array<string | number>): ObjectPath => {\n  return value as ObjectPath\n}\n\nconst ObjectPathRegex = /^[a-zA-Z_$][a-zA-Z0-9_$]*(?:\\.[a-zA-Z_$][a-zA-Z0-9_$]*|\\.\\d+|\\[\\d+])*$/\nconst ObjectPathPartRegex = /([a-zA-Z_$][a-zA-Z0-9_$]*)|\\[(\\d+)]|\\.(\\d+)/g\n\nexport const fromString = (path: string): ObjectPath => {\n  assert(ObjectPathRegex.test(path), () => `Unable to parse ObjectPath from string: ${path}`)\n\n  const result: Array<string | number> = []\n\n  let match: RegExpExecArray | null\n  while ((match = ObjectPathPartRegex.exec(path)) !== null) {\n    if (match[1] !== undefined) {\n      // Property name (e.g., 'users', 'profile')\n      result.push(match[1])\n    } else if (match[2] !== undefined) {\n      // Bracket notation array index (e.g., [0])\n      result.push(Number(match[2]))\n    } else if (match[3] !== undefined) {\n      // Dot notation array index (e.g., .0)\n      result.push(Number(match[3]))\n    }\n  }\n\n  return of(result)\n}\n\nexport const getValue = (object: UnknownRecord, path: ObjectPath): unknown => {\n  const result = getValueResult(object, path)\n\n  if (result.isSuccess) {\n    return result.value\n  } else {\n    throw new Error(`Unable to resolve ObjectPath: ${path} against record: ${JSON.stringify(object)}`)\n  }\n}\n\nexport const findValue = (object: UnknownRecord, path: ObjectPath): unknown | undefined => {\n  const result = getValueResult(object, path)\n\n  if (result.isSuccess) {\n    return result.value\n  } else {\n    return undefined\n  }\n}\n\nexport const applyValue = (object: UnknownRecord, path: ObjectPath, valueToApply: unknown): unknown => {\n  if (isEmpty(path)) {\n    return valueToApply\n  }\n\n  return produce(object, (draft) => {\n    const rest = path.slice(0, -1)\n    const last = path[path.length - 1]!\n    const parent: any = isEmpty(rest) ? draft : getValue(draft, of(rest))\n\n    // Check to make sure the last index is ok\n    assertLegalIndex(parent, last, object, path)\n    parent[last] = valueToApply\n  })\n}\n\nconst getValueResult = (object: UnknownRecord, path: ObjectPath): Result<any> => {\n  let value: any = object\n\n  for (const key of path) {\n    if (isNumber(key) && Array.isArray(value)) {\n      if (key < 0 || key >= value.length) {\n        return failure()\n      }\n\n      value = value[key]\n    } else if (isString(key) && isObject(value)) {\n      if (!(key in value)) {\n        return failure()\n      }\n\n      value = value[key]\n    } else {\n      return failure()\n    }\n  }\n\n  return success(value)\n}\n\nconst assertLegalIndex = (value: any, key: string | number, object: UnknownRecord, path: ObjectPath): void => {\n  if (isNumber(key) && Array.isArray(value)) {\n    return\n  } else if (isString(key) && isObject(value)) {\n    return\n  } else {\n    throw new Error(`Unable to resolve ObjectPath: ${path} against record: ${JSON.stringify(object)}`)\n  }\n}\n"],"mappings":"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","names":[]}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bessemer/cornerstone",
   "type": "module",
-  "version": "0.5.67",
+  "version": "0.5.69",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "sideEffects": false,