synapse-react-client 4.0.45 → 4.0.47

package/dist/utils/hooks/useGetInfoFromIds.js.map

@@ -1 +1 @@
-{"version":3,"file":"useGetInfoFromIds.js","names":[],"sources":["../../../src/utils/hooks/useGetInfoFromIds.ts"],"sourcesContent":["import {\n  getEntityHeaders,\n  getEvaluations,\n  getGroupHeadersBatch,\n} from '@/synapse-client'\nimport {\n  EntityHeader,\n  Evaluation,\n  Reference,\n  ReferenceList,\n  UserGroupHeader,\n} from '@sage-bionetworks/synapse-types'\nimport { chunk, uniq, without } from 'lodash-es'\nimport { useEffect, useState } from 'react'\nimport useDeepCompareEffect from 'use-deep-compare-effect'\nimport { useSynapseContext } from '../context/SynapseContext'\nimport { SynapseConstants } from '../index'\n\nexport type UseGetInfoFromIdsProps<\n  T extends EntityHeader | UserGroupHeader | Evaluation,\n  THookType = T extends EntityHeader\n    ? 'ENTITY_HEADER'\n    : T extends UserGroupHeader\n      ? 'USER_PROFILE'\n      : T extends Evaluation\n        ? 'EVALUATION_QUEUE'\n        : never,\n> = {\n  ids: string[]\n  type: THookType\n}\n\ntype LookupRequestType = string | Reference\n\nconst UserGroupHeaderTemplate: UserGroupHeader = {\n  ownerId: '', // A foreign key to the ID of the 'principal' object for the user\n  firstName: 'Unknown', // This person's given name (forename)\n  lastName: 'Unknown', // This person's family name (surname)\n  userName: 'Unknown', // A name chosen by the user that uniquely identifies them\n  isIndividual: false,\n}\n\nconst entityHeaderTemplate: EntityHeader = {\n  name: 'Unknown', //\tThe name of the entity\n  id: 'unknown', //\tThe id of the entity\n  type: 'org.sagebionetworks.repo.model.FileEntity', //\tThe type of the entity\n  versionNumber: 0, //\tThe version number of the entity\n  versionLabel: 'placeholder', //\tThe user defined version label of the entity\n  benefactorId: 0, //\tThe ID of the entity that this Entity's ACL is inherited from.\n  createdOn: 'null', //\tThe date this entity was created.\n  modifiedOn: 'null', //\tThe date this entity was last modified.\n  createdBy: 'null', //\tThe ID of the user that created this entity.\n  modifiedBy: 'null', //\tThe ID of the user that last modified this entity.\n  isLatestVersion: true, // If this version is the latest version of the entity\n}\n\nconst evaluationTemplate: Evaluation = {\n  id: 'unknown', // The unique immutable ID for this Evaluation.\n  etag: 'Unknown', // Synapse employs an Optimistic Concurrency Control (OCC) scheme to handle concurrent updates. The eTag changes every time an Evaluation is updated; it is used to detect when a client's copy of an Evaluation is out-of-date.\n  name: 'Unknown', // The name of this Evaluation\n  description: 'Unknown', // A text description of this Evaluation.\n  ownerId: 'null', // The ID of the Synapse user who created this Evaluation.\n  createdOn: 'null', //\tThe date on which Evaluation was created.\n  contentSource: 'Unknown', // The Synapse ID of the Entity to which this Evaluation belongs, e.g. a reference to a Synapse project.\n  submissionInstructionsMessage: 'Unknown', // Message to display to users detailing acceptable formatting for Submissions to this Evaluation.\n  submissionReceiptMessage: 'Unknown', // Message to display to users upon successful submission to this Evaluation.\n}\n\nconst getEntityHeaderItems = async (\n  lookupList: ReferenceList,\n  accessToken: string | undefined,\n): Promise<EntityHeader[]> => {\n  const newData = await getEntityHeaders(lookupList, accessToken)\n  const notFound = lookupList.filter(\n    item => newData.results.map(item => item.id).indexOf(item.targetId) === -1,\n  )\n  const notFoundPlaceholders = notFound.map(item => ({\n    ...entityHeaderTemplate,\n    id: item.targetId,\n    name: `${item.targetId}`,\n  }))\n\n  return [...newData.results, ...notFoundPlaceholders]\n}\n\nconst getUserGroupHeaderItems = async (\n  lookupList: string[],\n  accessToken: string | undefined,\n): Promise<UserGroupHeader[]> => {\n  const newData = (await getGroupHeadersBatch(lookupList, accessToken)).children\n  const notFound = lookupList.filter(\n    item => newData.map(item => item.ownerId).indexOf(item) === -1,\n  )\n  const notFoundPlaceholders = notFound.map(item => ({\n    ...UserGroupHeaderTemplate,\n    ownerId: item,\n    name: `Unknown User (${item})`,\n  }))\n\n  return [...newData, ...notFoundPlaceholders]\n}\n\nconst getEvaluationItems = async (\n  lookupList: string[],\n  accessToken: string | undefined,\n): Promise<Evaluation[]> => {\n  const newData = await getEvaluations(\n    { evaluationIds: lookupList },\n    accessToken,\n  )\n  const notFound = lookupList.filter(\n    item => newData.results.map(item => item.id).indexOf(item) === -1,\n  )\n  const notFoundPlaceholders = notFound.map(item => ({\n    ...evaluationTemplate,\n    id: item,\n    name: item,\n  }))\n\n  return [...newData.results, ...notFoundPlaceholders]\n}\n\n/**\n * React hook to get user profiles or entities or evaluation queues. Utilizes a custom cache in sessionStorage.\n *\n * For fetching just one entity or usergroup, see useGetEntity/useGetUserGroupHeader hooks powered by react-query\n * @returns\n */\nexport default function useGetInfoFromIds<\n  T extends EntityHeader | UserGroupHeader | Evaluation,\n>(props: UseGetInfoFromIdsProps<T>): T[] {\n  const { ids, type } = props\n  const { accessToken } = useSynapseContext()\n\n  const [data, setData] = useState<Array<T>>([])\n\n  const idKey = (type === 'USER_PROFILE' ? 'ownerId' : 'id') as keyof T\n\n  const getStorageKey = (type: UseGetInfoFromIdsProps<T>['type']) => {\n    switch (type) {\n      case 'USER_PROFILE':\n        return SynapseConstants.USER_PROFILE_STORAGE_KEY\n      case 'ENTITY_HEADER':\n        return SynapseConstants.ENTITY_HEADER_STORAGE_KEY\n      case 'EVALUATION_QUEUE':\n        return SynapseConstants.EVALUATIONS_STORAGE_KEY\n      default:\n        return ''\n    }\n  }\n  const storageKey: string = getStorageKey(type)\n\n  // look at current list of data, see if incoming ids has new data,\n  // if so grab those ids\n  const curList = data.map(el => el[idKey]) as string[]\n  const incomingList = ids.filter(el => el !== SynapseConstants.VALUE_NOT_SET)\n  const newValues = uniq(without(incomingList, ...curList))\n\n  useEffect(() => {\n    const saveToSessionStorage = (data: T[]) => {\n      if (!data.length) {\n        return\n      }\n      //get what's there\n      const dataInStorage = sessionStorage.getItem(storageKey)\n      try {\n        const dataInStorageAsObjectArr: T[] = dataInStorage\n          ? JSON.parse(dataInStorage)\n          : []\n        //get an array of ids for items already in storage\n        const ids = dataInStorageAsObjectArr.map(item => item[idKey])\n        //push all the new data if ids are new\n        for (const dataObject of data) {\n          if (!ids.includes(dataObject[idKey])) {\n            dataInStorageAsObjectArr.push(dataObject)\n          }\n        }\n        sessionStorage.setItem(\n          storageKey,\n          JSON.stringify(dataInStorageAsObjectArr),\n        )\n      } catch (e) {\n        sessionStorage.setItem(storageKey, JSON.stringify(data))\n      }\n    }\n    saveToSessionStorage(data)\n  }, [data, idKey, storageKey])\n\n  // Alina TODO: check if the items are already in Local Storage before making server call.\n\n  // Michael TODO: There's a bug where the data held in useGetInfoFromIds will be stale if the user token changes,\n  // this can be solved by using the useCompare hook on the token to track when it changes\n  useDeepCompareEffect(() => {\n    let isCancelled = false\n    const getData = async () => {\n      if (newValues.length > 0) {\n        try {\n          const newIds = Array.from<string>(newValues)\n          const newReferences: LookupRequestType[] =\n            type === 'ENTITY_HEADER'\n              ? newIds.map(el => ({ targetId: el }))\n              : newIds\n          const newReferencesChunks = chunk(newReferences, 45)\n          const totalData: T[] = []\n          for (const newReferences of newReferencesChunks) {\n            let newData: T[] = []\n            switch (type) {\n              case 'USER_PROFILE':\n                newData = (await getUserGroupHeaderItems(\n                  newReferences as string[],\n                  accessToken,\n                )) as T[]\n                break\n              case 'ENTITY_HEADER':\n                newData = (await getEntityHeaderItems(\n                  newReferences as ReferenceList,\n                  accessToken,\n                )) as T[]\n                break\n              case 'EVALUATION_QUEUE':\n                newData = (await getEvaluationItems(\n                  newReferences as string[],\n                  accessToken,\n                )) as T[]\n                break\n            }\n            totalData.push(...newData)\n          }\n          if (!isCancelled) {\n            setData(oldData => oldData.concat(...totalData))\n          }\n        } catch (error) {\n          console.error('Error on data retrieval', error)\n        }\n      }\n    }\n    getData()\n    return () => {\n      isCancelled = true\n    }\n  }, [accessToken, type, newValues])\n  return data\n}\n"],"mappings":"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"}
+{"version":3,"file":"useGetInfoFromIds.js","names":[],"sources":["../../../src/utils/hooks/useGetInfoFromIds.ts"],"sourcesContent":["import {\n  getEntityHeaders,\n  getEvaluations,\n  getGroupHeadersBatch,\n} from '@/synapse-client'\nimport {\n  EntityHeader,\n  Evaluation,\n  Reference,\n  ReferenceList,\n  UserGroupHeader,\n} from '@sage-bionetworks/synapse-types'\nimport { chunk, uniq, without } from 'lodash-es'\nimport { useEffect, useState } from 'react'\nimport useDeepCompareEffect from 'use-deep-compare-effect'\nimport { useSynapseContext } from '../context/SynapseContext'\nimport { SynapseConstants } from '../index'\n\nexport type UseGetInfoFromIdsProps<\n  T extends EntityHeader | UserGroupHeader | Evaluation,\n  THookType = T extends EntityHeader\n    ? 'ENTITY_HEADER'\n    : T extends UserGroupHeader\n      ? 'USER_PROFILE'\n      : T extends Evaluation\n        ? 'EVALUATION_QUEUE'\n        : never,\n> = {\n  ids: string[]\n  type: THookType\n}\n\ntype LookupRequestType = string | Reference\n\nconst UserGroupHeaderTemplate: UserGroupHeader = {\n  ownerId: '', // A foreign key to the ID of the 'principal' object for the user\n  firstName: 'Unknown', // This person's given name (forename)\n  lastName: 'Unknown', // This person's family name (surname)\n  userName: 'Unknown', // A name chosen by the user that uniquely identifies them\n  isIndividual: false,\n}\n\nconst entityHeaderTemplate: EntityHeader = {\n  name: 'Unknown', //\tThe name of the entity\n  id: 'unknown', //\tThe id of the entity\n  type: 'org.sagebionetworks.repo.model.FileEntity', //\tThe type of the entity\n  versionNumber: 0, //\tThe version number of the entity\n  versionLabel: 'placeholder', //\tThe user defined version label of the entity\n  benefactorId: 0, //\tThe ID of the entity that this Entity's ACL is inherited from.\n  createdOn: 'null', //\tThe date this entity was created.\n  modifiedOn: 'null', //\tThe date this entity was last modified.\n  createdBy: 'null', //\tThe ID of the user that created this entity.\n  modifiedBy: 'null', //\tThe ID of the user that last modified this entity.\n  isLatestVersion: true, // If this version is the latest version of the entity\n}\n\nconst evaluationTemplate: Evaluation = {\n  id: 'unknown', // The unique immutable ID for this Evaluation.\n  etag: 'Unknown', // Synapse employs an Optimistic Concurrency Control (OCC) scheme to handle concurrent updates. The eTag changes every time an Evaluation is updated; it is used to detect when a client's copy of an Evaluation is out-of-date.\n  name: 'Unknown', // The name of this Evaluation\n  description: 'Unknown', // A text description of this Evaluation.\n  ownerId: 'null', // The ID of the Synapse user who created this Evaluation.\n  createdOn: 'null', //\tThe date on which Evaluation was created.\n  contentSource: 'Unknown', // The Synapse ID of the Entity to which this Evaluation belongs, e.g. a reference to a Synapse project.\n  submissionInstructionsMessage: 'Unknown', // Message to display to users detailing acceptable formatting for Submissions to this Evaluation.\n  submissionReceiptMessage: 'Unknown', // Message to display to users upon successful submission to this Evaluation.\n}\n\nconst getEntityHeaderItems = async (\n  lookupList: ReferenceList,\n  accessToken: string | undefined,\n): Promise<EntityHeader[]> => {\n  const newData = await getEntityHeaders(lookupList, accessToken)\n  const notFound = lookupList.filter(\n    item => !newData.results.map(item => item.id).includes(item.targetId),\n  )\n  const notFoundPlaceholders = notFound.map(item => ({\n    ...entityHeaderTemplate,\n    id: item.targetId,\n    name: `${item.targetId}`,\n  }))\n\n  return [...newData.results, ...notFoundPlaceholders]\n}\n\nconst getUserGroupHeaderItems = async (\n  lookupList: string[],\n  accessToken: string | undefined,\n): Promise<UserGroupHeader[]> => {\n  const newData = (await getGroupHeadersBatch(lookupList, accessToken)).children\n  const notFound = lookupList.filter(\n    item => !newData.map(item => item.ownerId).includes(item),\n  )\n  const notFoundPlaceholders = notFound.map(item => ({\n    ...UserGroupHeaderTemplate,\n    ownerId: item,\n    name: `Unknown User (${item})`,\n  }))\n\n  return [...newData, ...notFoundPlaceholders]\n}\n\nconst getEvaluationItems = async (\n  lookupList: string[],\n  accessToken: string | undefined,\n): Promise<Evaluation[]> => {\n  const newData = await getEvaluations(\n    { evaluationIds: lookupList },\n    accessToken,\n  )\n  const notFound = lookupList.filter(\n    item => !newData.results.map(item => item.id).includes(item),\n  )\n  const notFoundPlaceholders = notFound.map(item => ({\n    ...evaluationTemplate,\n    id: item,\n    name: item,\n  }))\n\n  return [...newData.results, ...notFoundPlaceholders]\n}\n\n/**\n * React hook to get user profiles or entities or evaluation queues. Utilizes a custom cache in sessionStorage.\n *\n * For fetching just one entity or usergroup, see useGetEntity/useGetUserGroupHeader hooks powered by react-query\n * @returns\n */\nexport default function useGetInfoFromIds<\n  T extends EntityHeader | UserGroupHeader | Evaluation,\n>(props: UseGetInfoFromIdsProps<T>): T[] {\n  const { ids, type } = props\n  const { accessToken } = useSynapseContext()\n\n  const [data, setData] = useState<Array<T>>([])\n\n  const idKey = (type === 'USER_PROFILE' ? 'ownerId' : 'id') as keyof T\n\n  const getStorageKey = (type: UseGetInfoFromIdsProps<T>['type']) => {\n    switch (type) {\n      case 'USER_PROFILE':\n        return SynapseConstants.USER_PROFILE_STORAGE_KEY\n      case 'ENTITY_HEADER':\n        return SynapseConstants.ENTITY_HEADER_STORAGE_KEY\n      case 'EVALUATION_QUEUE':\n        return SynapseConstants.EVALUATIONS_STORAGE_KEY\n      default:\n        return ''\n    }\n  }\n  const storageKey: string = getStorageKey(type)\n\n  // look at current list of data, see if incoming ids has new data,\n  // if so grab those ids\n  const curList = data.map(el => el[idKey]) as string[]\n  const incomingList = ids.filter(el => el !== SynapseConstants.VALUE_NOT_SET)\n  const newValues = uniq(without(incomingList, ...curList))\n\n  useEffect(() => {\n    const saveToSessionStorage = (data: T[]) => {\n      if (!data.length) {\n        return\n      }\n      //get what's there\n      const dataInStorage = sessionStorage.getItem(storageKey)\n      try {\n        const dataInStorageAsObjectArr: T[] = dataInStorage\n          ? JSON.parse(dataInStorage)\n          : []\n        //get an array of ids for items already in storage\n        const ids = new Set(dataInStorageAsObjectArr.map(item => item[idKey]))\n        //push all the new data if ids are new\n        for (const dataObject of data) {\n          if (!ids.has(dataObject[idKey])) {\n            dataInStorageAsObjectArr.push(dataObject)\n          }\n        }\n        sessionStorage.setItem(\n          storageKey,\n          JSON.stringify(dataInStorageAsObjectArr),\n        )\n      } catch (e) {\n        sessionStorage.setItem(storageKey, JSON.stringify(data))\n      }\n    }\n    saveToSessionStorage(data)\n  }, [data, idKey, storageKey])\n\n  // Alina TODO: check if the items are already in Local Storage before making server call.\n\n  // Michael TODO: There's a bug where the data held in useGetInfoFromIds will be stale if the user token changes,\n  // this can be solved by using the useCompare hook on the token to track when it changes\n  useDeepCompareEffect(() => {\n    let isCancelled = false\n    const getData = async () => {\n      if (newValues.length > 0) {\n        try {\n          const newIds = Array.from<string>(newValues)\n          const newReferences: LookupRequestType[] =\n            type === 'ENTITY_HEADER'\n              ? newIds.map(el => ({ targetId: el }))\n              : newIds\n          const newReferencesChunks = chunk(newReferences, 45)\n          const totalData: T[] = []\n          for (const newReferences of newReferencesChunks) {\n            let newData: T[] = []\n            switch (type) {\n              case 'USER_PROFILE':\n                newData = (await getUserGroupHeaderItems(\n                  newReferences as string[],\n                  accessToken,\n                )) as T[]\n                break\n              case 'ENTITY_HEADER':\n                newData = (await getEntityHeaderItems(\n                  newReferences as ReferenceList,\n                  accessToken,\n                )) as T[]\n                break\n              case 'EVALUATION_QUEUE':\n                newData = (await getEvaluationItems(\n                  newReferences as string[],\n                  accessToken,\n                )) as T[]\n                break\n            }\n            totalData.push(...newData)\n          }\n          if (!isCancelled) {\n            setData(oldData => oldData.concat(...totalData))\n          }\n        } catch (error) {\n          console.error('Error on data retrieval', error)\n        }\n      }\n    }\n    getData()\n    return () => {\n      isCancelled = true\n    }\n  }, [accessToken, type, newValues])\n  return data\n}\n"],"mappings":"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"}

package/dist/utils/hooks/useImmutableTableQuery/TableQueryReducerActions.js

@@ -18,7 +18,7 @@ function s(e, t) {
 }
 function c(e, t) {
 	let n = i(t), { facetsToRemove: o } = e, s = Array.isArray(o);
-	return n.query.selectedFacets = (n.query.selectedFacets ?? []).filter((e) => s ? !o.find((t) => r(t, e)) : !r(o, e)), a(n, t) || (n.query.offset = 0), n;
+	return n.query.selectedFacets = (n.query.selectedFacets ?? []).filter((e) => s ? !o.some((t) => r(t, e)) : !r(o, e)), a(n, t) || (n.query.offset = 0), n;
 }
 function l(e, t) {
 	let n = i(t), { facet: o, min: s, max: c } = e, l = i(n.query.selectedFacets ?? []), u = l.find((e) => e.concreteType === "org.sagebionetworks.repo.model.table.FacetColumnRangeRequest" && r(o, e));

package/dist/utils/hooks/useImmutableTableQuery/TableQueryReducerActions.js.map

@@ -1 +1 @@
-{"version":3,"file":"TableQueryReducerActions.js","names":[],"sources":["../../../../src/utils/hooks/useImmutableTableQuery/TableQueryReducerActions.ts"],"sourcesContent":["import {\n  isColumnMultiValueFunctionQueryFilter,\n  isColumnSingleValueQueryFilter,\n  isFacetColumnValuesRequest,\n} from '@/utils/types/IsType'\nimport { UniqueFacetIdentifier } from '@/utils/types/UniqueFacetIdentifier'\nimport {\n  FacetColumnRangeRequest,\n  FacetColumnValuesRequest,\n  QueryBundleRequest,\n  QueryFilter,\n} from '@sage-bionetworks/synapse-types'\nimport { cloneDeep, isEqual } from 'lodash-es'\nimport * as React from 'react'\nimport { facetObjectMatchesDefinition } from '../../functions/queryUtils'\nimport { DEFAULT_PAGE_SIZE } from '../../SynapseConstants'\nimport { QueryChangeCommitOptions } from './useTableQueryReducer'\n\nexport function getQueryFromSetStateAction(\n  action: { commitOptions?: QueryChangeCommitOptions } & {\n    type: 'setQuery'\n    queryOrUpdater: React.SetStateAction<QueryBundleRequest>\n  },\n  queryRequest: QueryBundleRequest,\n): QueryBundleRequest {\n  const queryRequestClone = cloneDeep(queryRequest)\n  const { queryOrUpdater } = action\n  if (typeof queryOrUpdater === 'function') {\n    return queryOrUpdater(queryRequestClone)\n  } else {\n    return queryOrUpdater\n  }\n}\n\nexport function addValueToSelectedFacet(\n  action: { commitOptions?: QueryChangeCommitOptions } & {\n    type: 'addValueToSelectedFacet'\n    facet: UniqueFacetIdentifier\n    value: string\n  },\n  queryRequest: QueryBundleRequest,\n) {\n  const queryRequestClone = cloneDeep(queryRequest)\n  const { facet, value } = action\n  const newFacets = queryRequestClone.query.selectedFacets ?? []\n\n  const existingFacetSelection = newFacets.find(\n    (existingFacet): existingFacet is FacetColumnValuesRequest => {\n      return (\n        existingFacet.concreteType ===\n          'org.sagebionetworks.repo.model.table.FacetColumnValuesRequest' &&\n        facetObjectMatchesDefinition(facet, existingFacet)\n      )\n    },\n  )\n\n  if (existingFacetSelection) {\n    if (!existingFacetSelection.facetValues.includes(value)) {\n      existingFacetSelection.facetValues.push(value)\n    }\n  } else {\n    newFacets.push({\n      concreteType:\n        'org.sagebionetworks.repo.model.table.FacetColumnValuesRequest',\n      columnName: facet.columnName,\n      jsonPath: facet.jsonPath,\n      facetValues: [value],\n    })\n  }\n  queryRequestClone.query.selectedFacets = newFacets\n  if (!isEqual(queryRequestClone, queryRequest)) {\n    queryRequestClone.query.offset = 0\n  }\n  return queryRequestClone\n}\n\nexport function removeSelectedFacet(\n  action: { commitOptions?: QueryChangeCommitOptions } & {\n    type: 'removeSelectedFacet'\n    facetsToRemove: UniqueFacetIdentifier | UniqueFacetIdentifier[]\n  },\n  queryRequest: QueryBundleRequest,\n): QueryBundleRequest {\n  const queryRequestClone = cloneDeep(queryRequest)\n  const { facetsToRemove } = action\n  const isArray = Array.isArray(facetsToRemove)\n  queryRequestClone.query.selectedFacets = (\n    queryRequestClone.query.selectedFacets ?? []\n  ).filter(facet => {\n    // Use lodash for deep comparison\n    if (isArray) {\n      return !facetsToRemove.find(item => {\n        return facetObjectMatchesDefinition(item, facet)\n      })\n    } else {\n      return !facetObjectMatchesDefinition(facetsToRemove, facet)\n    }\n  })\n  if (!isEqual(queryRequestClone, queryRequest)) {\n    queryRequestClone.query.offset = 0\n  }\n  return queryRequestClone\n}\n\nexport function setRangeFacetValue(\n  action: { commitOptions?: QueryChangeCommitOptions } & {\n    type: 'setRangeFacetValue'\n    facet: UniqueFacetIdentifier\n    min?: string\n    max?: string\n  },\n  queryRequest: QueryBundleRequest,\n) {\n  const queryRequestClone = cloneDeep(queryRequest)\n  const { facet, min, max } = action\n  const newFacets = cloneDeep(queryRequestClone.query.selectedFacets ?? [])\n\n  const existingFacetSelection = newFacets.find(\n    (existingFacet): existingFacet is FacetColumnRangeRequest => {\n      return (\n        existingFacet.concreteType ===\n          'org.sagebionetworks.repo.model.table.FacetColumnRangeRequest' &&\n        facetObjectMatchesDefinition(facet, existingFacet)\n      )\n    },\n  )\n  if (existingFacetSelection && min == null && max == null) {\n    // remove the facet\n    newFacets.splice(newFacets.indexOf(existingFacetSelection), 1)\n  } else if (existingFacetSelection) {\n    existingFacetSelection.min = min\n    existingFacetSelection.max = max\n  } else {\n    newFacets.push({\n      concreteType:\n        'org.sagebionetworks.repo.model.table.FacetColumnRangeRequest',\n      columnName: facet.columnName,\n      jsonPath: facet.jsonPath,\n      min,\n      max,\n    })\n  }\n  queryRequestClone.query.selectedFacets = newFacets\n  if (!isEqual(queryRequestClone, queryRequest)) {\n    queryRequestClone.query.offset = 0\n  }\n  return queryRequestClone\n}\n\nexport function removeValueFromSelectedFacet(\n  action: { commitOptions?: QueryChangeCommitOptions } & {\n    type: 'removeValueFromSelectedFacet'\n    facet: UniqueFacetIdentifier\n    value: string\n  },\n  queryRequest: QueryBundleRequest,\n) {\n  const queryRequestClone = cloneDeep(queryRequest)\n  const { facet, value } = action\n  queryRequestClone.query.selectedFacets = (\n    queryRequestClone.query.selectedFacets ?? []\n  )\n    // Modify the requested filter\n    .map(facetColumnRequest => {\n      if (\n        isFacetColumnValuesRequest(facetColumnRequest) &&\n        facetObjectMatchesDefinition(facet, facetColumnRequest)\n      ) {\n        // Remove the value from the filter\n        facetColumnRequest.facetValues = facetColumnRequest.facetValues.filter(\n          v => v !== value,\n        )\n      }\n      return facetColumnRequest\n    })\n    // Remove filters that have no values\n    .filter(facetColumnRequest => {\n      if (isFacetColumnValuesRequest(facetColumnRequest)) {\n        // Remove the value from the filter\n        return (\n          Array.isArray(facetColumnRequest.facetValues) &&\n          facetColumnRequest.facetValues.length > 0\n        )\n      }\n      return true\n    })\n  if (!isEqual(queryRequestClone, queryRequest)) {\n    queryRequestClone.query.offset = 0\n  }\n  return queryRequestClone\n}\n\nexport function removeQueryFilter(\n  action: {\n    type: 'removeQueryFilter'\n    queryFilter: QueryFilter\n  },\n  queryRequest: QueryBundleRequest,\n) {\n  const queryRequestClone = cloneDeep(queryRequest)\n  const { queryFilter } = action\n  queryRequestClone.query.additionalFilters = (\n    queryRequestClone.query.additionalFilters ?? []\n  ).filter(qf => {\n    // Use lodash for deep comparison\n    return !isEqual(qf, queryFilter)\n  })\n  if (!isEqual(queryRequestClone, queryRequest)) {\n    queryRequestClone.query.offset = 0\n  }\n  return queryRequestClone\n}\n\nexport function removeValueFromQueryFilter(\n  action: { commitOptions?: QueryChangeCommitOptions } & {\n    type: 'removeValueFromQueryFilter'\n    queryFilter: QueryFilter\n    value: string\n  },\n  queryRequest: QueryBundleRequest,\n) {\n  const queryRequestClone = cloneDeep(queryRequest)\n  const { queryFilter, value } = action\n  queryRequestClone.query.additionalFilters = (\n    queryRequestClone.query.additionalFilters ?? []\n  )\n    // Modify the requested filter\n    .map(qf => {\n      if (\n        (isColumnSingleValueQueryFilter(qf) ||\n          isColumnMultiValueFunctionQueryFilter(qf)) &&\n        isEqual(qf, queryFilter)\n      ) {\n        // Remove the value from the filter\n        qf.values = qf.values.filter(v => v !== value)\n      }\n      return qf\n    })\n    // Remove filters that have no values\n    .filter(qf => {\n      if (\n        isColumnSingleValueQueryFilter(qf) ||\n        isColumnMultiValueFunctionQueryFilter(qf)\n      ) {\n        // Remove the value from the filter\n        return Array.isArray(qf.values) && qf.values.length > 0\n      }\n      return true\n    })\n  if (!isEqual(queryRequestClone, queryRequest)) {\n    queryRequestClone.query.offset = 0\n  }\n  return queryRequestClone\n}\n\nexport function setPageSize(\n  action: { commitOptions?: QueryChangeCommitOptions } & {\n    type: 'setPageSize'\n    pageSize: number\n  },\n  queryRequest: QueryBundleRequest,\n) {\n  const queryRequestClone = cloneDeep(queryRequest)\n  const { pageSize } = action\n  queryRequestClone.query.limit = pageSize\n  return queryRequestClone\n}\n\nexport function goToPage(\n  action: { commitOptions?: QueryChangeCommitOptions } & {\n    type: 'goToPage'\n    pageNumber: number\n  },\n  queryRequest: QueryBundleRequest,\n) {\n  const queryRequestClone = cloneDeep(queryRequest)\n  const { pageNumber } = action\n  const pageSize = queryRequest.query.limit ?? DEFAULT_PAGE_SIZE\n  queryRequestClone.query.offset = (pageNumber - 1) * pageSize\n  return queryRequestClone\n}\n"],"mappings":"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"}
+{"version":3,"file":"TableQueryReducerActions.js","names":[],"sources":["../../../../src/utils/hooks/useImmutableTableQuery/TableQueryReducerActions.ts"],"sourcesContent":["import {\n  isColumnMultiValueFunctionQueryFilter,\n  isColumnSingleValueQueryFilter,\n  isFacetColumnValuesRequest,\n} from '@/utils/types/IsType'\nimport { UniqueFacetIdentifier } from '@/utils/types/UniqueFacetIdentifier'\nimport {\n  FacetColumnRangeRequest,\n  FacetColumnValuesRequest,\n  QueryBundleRequest,\n  QueryFilter,\n} from '@sage-bionetworks/synapse-types'\nimport { cloneDeep, isEqual } from 'lodash-es'\nimport * as React from 'react'\nimport { facetObjectMatchesDefinition } from '../../functions/queryUtils'\nimport { DEFAULT_PAGE_SIZE } from '../../SynapseConstants'\nimport { QueryChangeCommitOptions } from './useTableQueryReducer'\n\nexport function getQueryFromSetStateAction(\n  action: { commitOptions?: QueryChangeCommitOptions } & {\n    type: 'setQuery'\n    queryOrUpdater: React.SetStateAction<QueryBundleRequest>\n  },\n  queryRequest: QueryBundleRequest,\n): QueryBundleRequest {\n  const queryRequestClone = cloneDeep(queryRequest)\n  const { queryOrUpdater } = action\n  if (typeof queryOrUpdater === 'function') {\n    return queryOrUpdater(queryRequestClone)\n  } else {\n    return queryOrUpdater\n  }\n}\n\nexport function addValueToSelectedFacet(\n  action: { commitOptions?: QueryChangeCommitOptions } & {\n    type: 'addValueToSelectedFacet'\n    facet: UniqueFacetIdentifier\n    value: string\n  },\n  queryRequest: QueryBundleRequest,\n) {\n  const queryRequestClone = cloneDeep(queryRequest)\n  const { facet, value } = action\n  const newFacets = queryRequestClone.query.selectedFacets ?? []\n\n  const existingFacetSelection = newFacets.find(\n    (existingFacet): existingFacet is FacetColumnValuesRequest => {\n      return (\n        existingFacet.concreteType ===\n          'org.sagebionetworks.repo.model.table.FacetColumnValuesRequest' &&\n        facetObjectMatchesDefinition(facet, existingFacet)\n      )\n    },\n  )\n\n  if (existingFacetSelection) {\n    if (!existingFacetSelection.facetValues.includes(value)) {\n      existingFacetSelection.facetValues.push(value)\n    }\n  } else {\n    newFacets.push({\n      concreteType:\n        'org.sagebionetworks.repo.model.table.FacetColumnValuesRequest',\n      columnName: facet.columnName,\n      jsonPath: facet.jsonPath,\n      facetValues: [value],\n    })\n  }\n  queryRequestClone.query.selectedFacets = newFacets\n  if (!isEqual(queryRequestClone, queryRequest)) {\n    queryRequestClone.query.offset = 0\n  }\n  return queryRequestClone\n}\n\nexport function removeSelectedFacet(\n  action: { commitOptions?: QueryChangeCommitOptions } & {\n    type: 'removeSelectedFacet'\n    facetsToRemove: UniqueFacetIdentifier | UniqueFacetIdentifier[]\n  },\n  queryRequest: QueryBundleRequest,\n): QueryBundleRequest {\n  const queryRequestClone = cloneDeep(queryRequest)\n  const { facetsToRemove } = action\n  const isArray = Array.isArray(facetsToRemove)\n  queryRequestClone.query.selectedFacets = (\n    queryRequestClone.query.selectedFacets ?? []\n  ).filter(facet => {\n    // Use lodash for deep comparison\n    if (isArray) {\n      return !facetsToRemove.some(item => {\n        return facetObjectMatchesDefinition(item, facet)\n      })\n    } else {\n      return !facetObjectMatchesDefinition(facetsToRemove, facet)\n    }\n  })\n  if (!isEqual(queryRequestClone, queryRequest)) {\n    queryRequestClone.query.offset = 0\n  }\n  return queryRequestClone\n}\n\nexport function setRangeFacetValue(\n  action: { commitOptions?: QueryChangeCommitOptions } & {\n    type: 'setRangeFacetValue'\n    facet: UniqueFacetIdentifier\n    min?: string\n    max?: string\n  },\n  queryRequest: QueryBundleRequest,\n) {\n  const queryRequestClone = cloneDeep(queryRequest)\n  const { facet, min, max } = action\n  const newFacets = cloneDeep(queryRequestClone.query.selectedFacets ?? [])\n\n  const existingFacetSelection = newFacets.find(\n    (existingFacet): existingFacet is FacetColumnRangeRequest => {\n      return (\n        existingFacet.concreteType ===\n          'org.sagebionetworks.repo.model.table.FacetColumnRangeRequest' &&\n        facetObjectMatchesDefinition(facet, existingFacet)\n      )\n    },\n  )\n  if (existingFacetSelection && min == null && max == null) {\n    // remove the facet\n    newFacets.splice(newFacets.indexOf(existingFacetSelection), 1)\n  } else if (existingFacetSelection) {\n    existingFacetSelection.min = min\n    existingFacetSelection.max = max\n  } else {\n    newFacets.push({\n      concreteType:\n        'org.sagebionetworks.repo.model.table.FacetColumnRangeRequest',\n      columnName: facet.columnName,\n      jsonPath: facet.jsonPath,\n      min,\n      max,\n    })\n  }\n  queryRequestClone.query.selectedFacets = newFacets\n  if (!isEqual(queryRequestClone, queryRequest)) {\n    queryRequestClone.query.offset = 0\n  }\n  return queryRequestClone\n}\n\nexport function removeValueFromSelectedFacet(\n  action: { commitOptions?: QueryChangeCommitOptions } & {\n    type: 'removeValueFromSelectedFacet'\n    facet: UniqueFacetIdentifier\n    value: string\n  },\n  queryRequest: QueryBundleRequest,\n) {\n  const queryRequestClone = cloneDeep(queryRequest)\n  const { facet, value } = action\n  queryRequestClone.query.selectedFacets = (\n    queryRequestClone.query.selectedFacets ?? []\n  )\n    // Modify the requested filter\n    .map(facetColumnRequest => {\n      if (\n        isFacetColumnValuesRequest(facetColumnRequest) &&\n        facetObjectMatchesDefinition(facet, facetColumnRequest)\n      ) {\n        // Remove the value from the filter\n        facetColumnRequest.facetValues = facetColumnRequest.facetValues.filter(\n          v => v !== value,\n        )\n      }\n      return facetColumnRequest\n    })\n    // Remove filters that have no values\n    .filter(facetColumnRequest => {\n      if (isFacetColumnValuesRequest(facetColumnRequest)) {\n        // Remove the value from the filter\n        return (\n          Array.isArray(facetColumnRequest.facetValues) &&\n          facetColumnRequest.facetValues.length > 0\n        )\n      }\n      return true\n    })\n  if (!isEqual(queryRequestClone, queryRequest)) {\n    queryRequestClone.query.offset = 0\n  }\n  return queryRequestClone\n}\n\nexport function removeQueryFilter(\n  action: {\n    type: 'removeQueryFilter'\n    queryFilter: QueryFilter\n  },\n  queryRequest: QueryBundleRequest,\n) {\n  const queryRequestClone = cloneDeep(queryRequest)\n  const { queryFilter } = action\n  queryRequestClone.query.additionalFilters = (\n    queryRequestClone.query.additionalFilters ?? []\n  ).filter(qf => {\n    // Use lodash for deep comparison\n    return !isEqual(qf, queryFilter)\n  })\n  if (!isEqual(queryRequestClone, queryRequest)) {\n    queryRequestClone.query.offset = 0\n  }\n  return queryRequestClone\n}\n\nexport function removeValueFromQueryFilter(\n  action: { commitOptions?: QueryChangeCommitOptions } & {\n    type: 'removeValueFromQueryFilter'\n    queryFilter: QueryFilter\n    value: string\n  },\n  queryRequest: QueryBundleRequest,\n) {\n  const queryRequestClone = cloneDeep(queryRequest)\n  const { queryFilter, value } = action\n  queryRequestClone.query.additionalFilters = (\n    queryRequestClone.query.additionalFilters ?? []\n  )\n    // Modify the requested filter\n    .map(qf => {\n      if (\n        (isColumnSingleValueQueryFilter(qf) ||\n          isColumnMultiValueFunctionQueryFilter(qf)) &&\n        isEqual(qf, queryFilter)\n      ) {\n        // Remove the value from the filter\n        qf.values = qf.values.filter(v => v !== value)\n      }\n      return qf\n    })\n    // Remove filters that have no values\n    .filter(qf => {\n      if (\n        isColumnSingleValueQueryFilter(qf) ||\n        isColumnMultiValueFunctionQueryFilter(qf)\n      ) {\n        // Remove the value from the filter\n        return Array.isArray(qf.values) && qf.values.length > 0\n      }\n      return true\n    })\n  if (!isEqual(queryRequestClone, queryRequest)) {\n    queryRequestClone.query.offset = 0\n  }\n  return queryRequestClone\n}\n\nexport function setPageSize(\n  action: { commitOptions?: QueryChangeCommitOptions } & {\n    type: 'setPageSize'\n    pageSize: number\n  },\n  queryRequest: QueryBundleRequest,\n) {\n  const queryRequestClone = cloneDeep(queryRequest)\n  const { pageSize } = action\n  queryRequestClone.query.limit = pageSize\n  return queryRequestClone\n}\n\nexport function goToPage(\n  action: { commitOptions?: QueryChangeCommitOptions } & {\n    type: 'goToPage'\n    pageNumber: number\n  },\n  queryRequest: QueryBundleRequest,\n) {\n  const queryRequestClone = cloneDeep(queryRequest)\n  const { pageNumber } = action\n  const pageSize = queryRequest.query.limit ?? DEFAULT_PAGE_SIZE\n  queryRequestClone.query.offset = (pageNumber - 1) * pageSize\n  return queryRequestClone\n}\n"],"mappings":"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"}

package/dist/utils/hooks/useLogin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useLogin.d.ts","sourceRoot":"","sources":["../../../src/utils/hooks/useLogin.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,0BAA0B,EAC3B,MAAM,8EAA8E,CAAA;AAErF,OAAO,EAIL,oBAAoB,EAErB,MAAM,iCAAiC,CAAA;AAGxC,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAuB,MAAM,OAAO,CAAA;AAGrE,OAAO,EAAE,sBAAsB,EAAE,MAAM,iDAAiD,CAAA;AAGxF,MAAM,MAAM,eAAe,GAAG;IAC5B,eAAe,CAAC,EAAE,MAAM,IAAI,CAAA;IAC5B,kBAAkB,CAAC,EAAE,0BAA0B,CAAA;IAE/C,uBAAuB,CAAC,EAAE,CACxB,UAAU,EAAE,IAAI,CAAC,0BAA0B,EAAE,YAAY,GAAG,QAAQ,CAAC,KAClE,IAAI,CAAA;CACV,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EACA,oBAAoB,GACpB,mBAAmB,GACnB,sBAAsB,GACtB,WAAW,CAAA;IACf,YAAY,EAAE,QAAQ,CAAC,cAAc,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;IAC9D,yBAAyB,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAA;IACvE,qBAAqB,EAAE,CACrB,IAAI,EAAE,MAAM,EAEZ,OAAO,CAAC,EAAE,oBAAoB,KAC3B,IAAI,CAAA;IAET,uBAAuB,EAAE,CAAC,kBAAkB,EAAE,MAAM,KAAK,IAAI,CAAA;IAC7D,2BAA2B,EAAE,OAAO,CAAA;IACpC,2BAA2B,EAAE,OAAO,CAAA;IACpC,YAAY,EAAE,MAAM,GAAG,SAAS,CAAA;IAChC,cAAc,EAAE,OAAO,CAAA;CACxB,CAAA;AAUD;;GAEG;AACH,MAAM,CAAC,OAAO,UAAU,QAAQ,CAAC,IAAI,EAAE,eAAe,GAAG,cAAc,CA0PtE"}
+{"version":3,"file":"useLogin.d.ts","sourceRoot":"","sources":["../../../src/utils/hooks/useLogin.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,0BAA0B,EAC3B,MAAM,8EAA8E,CAAA;AAErF,OAAO,EAIL,oBAAoB,EAErB,MAAM,iCAAiC,CAAA;AAGxC,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAuB,MAAM,OAAO,CAAA;AAGrE,OAAO,EAAE,sBAAsB,EAAE,MAAM,iDAAiD,CAAA;AAGxF,MAAM,MAAM,eAAe,GAAG;IAC5B,eAAe,CAAC,EAAE,MAAM,IAAI,CAAA;IAC5B,kBAAkB,CAAC,EAAE,0BAA0B,CAAA;IAE/C,uBAAuB,CAAC,EAAE,CACxB,UAAU,EAAE,IAAI,CAAC,0BAA0B,EAAE,YAAY,GAAG,QAAQ,CAAC,KAClE,IAAI,CAAA;CACV,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EACA,oBAAoB,GACpB,mBAAmB,GACnB,sBAAsB,GACtB,WAAW,CAAA;IACf,YAAY,EAAE,QAAQ,CAAC,cAAc,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;IAC9D,yBAAyB,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAA;IACvE,qBAAqB,EAAE,CACrB,IAAI,EAAE,MAAM,EAEZ,OAAO,CAAC,EAAE,oBAAoB,KAC3B,IAAI,CAAA;IAET,uBAAuB,EAAE,CAAC,kBAAkB,EAAE,MAAM,KAAK,IAAI,CAAA;IAC7D,2BAA2B,EAAE,OAAO,CAAA;IACpC,2BAA2B,EAAE,OAAO,CAAA;IACpC,YAAY,EAAE,MAAM,GAAG,SAAS,CAAA;IAChC,cAAc,EAAE,OAAO,CAAA;CACxB,CAAA;AAWD;;GAEG;AACH,MAAM,CAAC,OAAO,UAAU,QAAQ,CAAC,IAAI,EAAE,eAAe,GAAG,cAAc,CA0PtE"}

package/dist/utils/hooks/useLogin.js

@@ -10,12 +10,12 @@ import { ErrorResponseCode as c } from "@sage-bionetworks/synapse-types";
 import { instanceOfTwoFactorAuthErrorResponse as l } from "@sage-bionetworks/synapse-client/generated/models/TwoFactorAuthErrorResponse";
 import { useMutation as u } from "@tanstack/react-query";
 //#region src/utils/hooks/useLogin.ts
-var d = [
+var d = new Set([
 	"VERIFICATION_CODE",
 	"RECOVERY_CODE",
 	"LOGGED_IN",
 	"DISABLE_2FA_PROMPT"
-];
+]);
 function f(f) {
 	let { sessionCallback: p = s, twoFaErrorResponse: m, onTwoFactorAuthRequired: h = s } = f, [g, _] = o("CHOOSE_AUTH_METHOD"), [v, y] = o(), [b, x] = o(), S = n("/changePassword");
 	a(() => {
@@ -30,10 +30,10 @@ function f(f) {
 				userId: parseInt(t, 10),
 				twoFaToken: n,
 				concreteType: "org.sagebionetworks.repo.model.auth.TwoFactorAuthErrorResponse"
-			}), d.includes(g) || _("VERIFICATION_CODE"));
+			}), d.has(g) || _("VERIFICATION_CODE"));
 		}
 	}, [g]), a(() => {
-		b && (x(b), d.includes(g) || _("VERIFICATION_CODE"));
+		b && (x(b), d.has(g) || _("VERIFICATION_CODE"));
 	}, [b]), a(() => {
 		b && h(b);
 	}, [h, b]), a(() => {
@@ -53,7 +53,7 @@ function f(f) {
 			e && (l(e) ? (_("VERIFICATION_CODE"), x(e)) : await C(e));
 		}
 	}), { mutate: E, isPending: D } = u({
-		mutationFn: t.loginWith2fa,
+		mutationFn: (e) => t.loginWith2fa(e),
 		onError: (e) => {
 			y(e.reason), e.reason.includes("The provided code is invalid") ? y(`${e.reason} ${r}`) : (e.reason.includes("The provided twoFaToken is invalid") || e.reason.includes("Token has expired")) && (console.warn(e), y("Something went wrong. Refresh the page and try again."), window.location.href.includes("twoFaToken") && window.history.replaceState({}, document.title, window.location.href.replaceAll(/(twoFaToken|userId)=[^&]*&?/g, "")));
 		},

package/dist/utils/hooks/useLogin.js.map

@@ -1 +1 @@
-{"version":3,"file":"useLogin.js","names":[],"sources":["../../../src/utils/hooks/useLogin.ts"],"sourcesContent":["import SynapseClient from '@/synapse-client'\nimport { useResetTwoFactorAuth } from '@/synapse-queries'\nimport {\n  instanceOfTwoFactorAuthErrorResponse,\n  TwoFactorAuthErrorResponse,\n} from '@sage-bionetworks/synapse-client/generated/models/TwoFactorAuthErrorResponse'\nimport { SynapseClientError } from '@sage-bionetworks/synapse-client/util/SynapseClientError'\nimport {\n  ErrorResponseCode,\n  LoginResponse,\n  TwoFactorAuthLoginRequest,\n  TwoFactorAuthOtpType,\n  TwoFactorAuthResetRequest,\n} from '@sage-bionetworks/synapse-types'\nimport { useMutation } from '@tanstack/react-query'\nimport { noop } from 'lodash-es'\nimport { Dispatch, SetStateAction, useEffect, useState } from 'react'\nimport { AUTHENTICATION_RECEIPT_LOCALSTORAGE_KEY } from '../SynapseConstants'\nimport { useOneSageURL } from './useOneSageURL'\nimport { ONE_TIME_PASSWORD_STEP } from '@/components/Authentication/OneTimePasswordForm'\nimport { TOTP_CLOCK_SKEW_ERROR_APPENDAGE } from '@/components/Authentication/Constants'\n\nexport type UseLoginOptions = {\n  sessionCallback?: () => void\n  twoFaErrorResponse?: TwoFactorAuthErrorResponse\n  /* If a twoFactorAuthError is encountered (including passed in the twoFactorAuthenticationRequired arg), this callback will be invoked */\n  onTwoFactorAuthRequired?: (\n    twoFaToken: Pick<TwoFactorAuthErrorResponse, 'twoFaToken' | 'userId'>,\n  ) => void\n}\n\nexport type UseLoginReturn = {\n  step:\n    | 'CHOOSE_AUTH_METHOD'\n    | 'USERNAME_PASSWORD'\n    | ONE_TIME_PASSWORD_STEP\n    | 'LOGGED_IN'\n  onStepChange: Dispatch<SetStateAction<UseLoginReturn['step']>>\n  submitUsernameAndPassword: (username: string, password: string) => void\n  submitOneTimePassword: (\n    code: string,\n    /* The type of one time password code that can be used to authenticate through two-factor authentication. Default is based on current value of `step` */\n    otpType?: TwoFactorAuthOtpType,\n  ) => void\n  /* Trigger sending an email which can be used to disable 2FA */\n  beginTwoFactorAuthReset: (twoFaResetEndpoint: string) => void\n  twoFactorAuthResetIsPending: boolean\n  twoFactorAuthResetIsSuccess: boolean\n  errorMessage: string | undefined\n  loginIsPending: boolean\n}\n\n// When prompting the user for a 2FA code, allow the UI to show only these steps\nconst VALID_STEPS_DURING_2FA_PROMPT: Array<UseLoginReturn['step']> = [\n  'VERIFICATION_CODE',\n  'RECOVERY_CODE',\n  'LOGGED_IN',\n  'DISABLE_2FA_PROMPT',\n]\n\n/**\n * Stateful hook that manages logging into Synapse\n */\nexport default function useLogin(opts: UseLoginOptions): UseLoginReturn {\n  const {\n    sessionCallback = noop,\n    twoFaErrorResponse: twoFaErrorResponseFromProps,\n    onTwoFactorAuthRequired = noop,\n  } = opts\n  const [step, setStep] = useState<UseLoginReturn['step']>('CHOOSE_AUTH_METHOD')\n  const [errorMessage, setErrorMessage] = useState<string | undefined>()\n  const [twoFaErrorResponse, setTwoFaErrorResponse] = useState<\n    TwoFactorAuthErrorResponse | undefined\n  >()\n\n  const changePasswordUrl = useOneSageURL('/changePassword')\n  /**\n   * Update state variable if optional prop changes\n   */\n  useEffect(() => {\n    if (twoFaErrorResponseFromProps) {\n      setTwoFaErrorResponse(twoFaErrorResponseFromProps)\n    }\n  }, [twoFaErrorResponseFromProps])\n\n  /*\n   * In SWC, if logging in with OAuth, the servlet will call POST /oauth2/session2 to get the access token.\n   *\n   * If the user has 2FA enabled, the servlet will receive a 401 with the userId and twoFaToken in the response.\n   * The servlet will then redirect the user to the login page with the userId and twoFaToken in the searchParams.\n   *\n   * This effect will check if the search params are present, and change the step to 'VERIFICATION_CODE' if they are.\n   */\n  useEffect(() => {\n    const fullUrl: URL = new URL(window.location.href)\n\n    const { searchParams } = fullUrl\n    if (searchParams) {\n      const userId = searchParams.get('userId')\n      const twoFaToken = searchParams.get('twoFaToken')\n      if (userId && twoFaToken) {\n        setTwoFaErrorResponse({\n          errorCode: ErrorResponseCode.TWO_FA_REQUIRED,\n          reason: '',\n          userId: parseInt(userId, 10),\n          twoFaToken,\n          concreteType:\n            'org.sagebionetworks.repo.model.auth.TwoFactorAuthErrorResponse',\n        })\n        if (!VALID_STEPS_DURING_2FA_PROMPT.includes(step)) {\n          setStep('VERIFICATION_CODE')\n        }\n      }\n    }\n  }, [step])\n\n  /*\n   * In client-only apps (like Portals), if logging in with OAuth, the client app will call POST /oauth2/session2 to get the access token.\n   *\n   * If the user has 2FA enabled, the client app will receive a 401 with the userId and twoFaToken in the response.\n   *\n   * The app can pass the error response as a prop/argument, and we'll use it here to jump straight to the VERIFICATION_CODE step.\n   */\n  useEffect(() => {\n    if (twoFaErrorResponse) {\n      setTwoFaErrorResponse(twoFaErrorResponse)\n      if (!VALID_STEPS_DURING_2FA_PROMPT.includes(step)) {\n        setStep('VERIFICATION_CODE')\n      }\n    }\n    // We do NOT want to rerun this effect on step change. It should only run once, when we get the error.\n    // oxlint-disable-next-line react-hooks/exhaustive-deps\n  }, [twoFaErrorResponse])\n\n  /**\n   * Call the onTwoFactorAuthRequired callback when a twoFaToken is present\n   */\n  useEffect(() => {\n    if (twoFaErrorResponse) {\n      onTwoFactorAuthRequired(twoFaErrorResponse)\n    }\n  }, [onTwoFactorAuthRequired, twoFaErrorResponse])\n\n  /* When the step changes, clear the old error message. */\n  useEffect(() => {\n    setErrorMessage(undefined)\n  }, [step])\n\n  async function finishLogin(loginResponse: LoginResponse) {\n    await SynapseClient.setAccessTokenCookie(loginResponse.accessToken)\n    localStorage.setItem(\n      AUTHENTICATION_RECEIPT_LOCALSTORAGE_KEY,\n      loginResponse.authenticationReceipt ?? '',\n    )\n    setStep('LOGGED_IN')\n\n    if (sessionCallback) {\n      sessionCallback()\n    }\n  }\n\n  const {\n    mutate: mutateLoginWithUsernameAndPassword,\n    isPending: loginWithUsernameAndPasswordIsPending,\n  } = useMutation<\n    LoginResponse | TwoFactorAuthErrorResponse,\n    SynapseClientError,\n    { username: string; password: string; authenticationReceipt: string | null }\n  >({\n    mutationFn: ({ username, password, authenticationReceipt }) =>\n      SynapseClient.login(username, password, authenticationReceipt),\n    onError: error => {\n      setErrorMessage(error.reason)\n      const { errorResponse } = error\n      if (\n        errorResponse &&\n        'errorCode' in errorResponse &&\n        errorResponse.errorCode ==\n          ErrorResponseCode.PASSWORD_RESET_VIA_EMAIL_REQUIRED\n      ) {\n        window.location.assign(changePasswordUrl.toString())\n      }\n    },\n    onSuccess: async loginResponse => {\n      if (loginResponse) {\n        if (instanceOfTwoFactorAuthErrorResponse(loginResponse)) {\n          setStep('VERIFICATION_CODE')\n          setTwoFaErrorResponse(loginResponse)\n        } else {\n          await finishLogin(loginResponse)\n        }\n      }\n    },\n  })\n\n  const {\n    mutate: mutateLoginWith2FACode,\n    isPending: loginWith2FACodeIsPending,\n  } = useMutation<LoginResponse, SynapseClientError, TwoFactorAuthLoginRequest>(\n    {\n      mutationFn: SynapseClient.loginWith2fa,\n      onError: e => {\n        setErrorMessage(e.reason)\n        if (e.reason.includes('The provided code is invalid')) {\n          // The most common cause of an invalid TOTP code is clock skew between the user's device and the server.\n          setErrorMessage(`${e.reason} ${TOTP_CLOCK_SKEW_ERROR_APPENDAGE}`)\n        } else if (\n          // The twoFaToken wasn't transmitted correctly\n          e.reason.includes('The provided twoFaToken is invalid') ||\n          // The user waited too long to enter the code.\n          e.reason.includes('Token has expired')\n        ) {\n          console.warn(e)\n          // Instruct the user refresh to start over.\n          setErrorMessage(\n            'Something went wrong. Refresh the page and try again.',\n          )\n          // If the 2FA token is in the search parameters, remove it so the user doesn't just get the same error again.\n          if (window.location.href.includes('twoFaToken')) {\n            window.history.replaceState(\n              {},\n              document.title,\n              // using regex because SWC hashbang doesn't work with URLSearchParams\n              window.location.href.replaceAll(\n                /(twoFaToken|userId)=[^&]*&?/g,\n                '',\n              ),\n            )\n          }\n        }\n      },\n      onSuccess: finishLogin,\n    },\n  )\n\n  const {\n    mutate: resetTwoFactorAuth,\n    isSuccess: twoFactorAuthResetIsSuccess,\n    isPending: twoFactorAuthResetIsPending,\n  } = useResetTwoFactorAuth({\n    onError: e => {\n      setErrorMessage(e.reason)\n    },\n  })\n\n  const submitUsernameAndPassword: UseLoginReturn['submitUsernameAndPassword'] =\n    (username, password) => {\n      setErrorMessage(undefined)\n      const authenticationReceipt = localStorage.getItem(\n        AUTHENTICATION_RECEIPT_LOCALSTORAGE_KEY,\n      )\n      mutateLoginWithUsernameAndPassword({\n        username,\n        password,\n        authenticationReceipt,\n      })\n    }\n\n  function verifyTwoFaErrorIsPresent(\n    twoFaErrorResponse: TwoFactorAuthErrorResponse | null | undefined,\n  ): twoFaErrorResponse is TwoFactorAuthErrorResponse {\n    if (twoFaErrorResponse == null) {\n      // This type of error could happen if the 2FA component exists on its own route, and the user directly navigates to it without first logging in with credentials/OAuth\n      setErrorMessage(\n        'You did not first log in with your password or a third-party identity provider.',\n      )\n      return false\n    }\n    return true\n  }\n\n  const submitOneTimePassword: UseLoginReturn['submitOneTimePassword'] = (\n    code,\n    otpType = step === 'RECOVERY_CODE' ? 'RECOVERY_CODE' : 'TOTP',\n  ) => {\n    setErrorMessage(undefined)\n    if (verifyTwoFaErrorIsPresent(twoFaErrorResponse)) {\n      const request: TwoFactorAuthLoginRequest = {\n        userId: twoFaErrorResponse.userId!,\n        twoFaToken: twoFaErrorResponse.twoFaToken!,\n        otpCode: code,\n        otpType: otpType,\n      }\n      mutateLoginWith2FACode(request)\n    }\n  }\n\n  const beginTwoFactorAuthReset: UseLoginReturn['beginTwoFactorAuthReset'] = (\n    twoFaResetEndpoint: string,\n  ) => {\n    setErrorMessage(undefined)\n    if (verifyTwoFaErrorIsPresent(twoFaErrorResponse)) {\n      const request: TwoFactorAuthResetRequest = {\n        userId: twoFaErrorResponse.userId!,\n        twoFaToken: twoFaErrorResponse.twoFaToken,\n        twoFaResetEndpoint: twoFaResetEndpoint,\n      }\n      resetTwoFactorAuth(request)\n    }\n  }\n\n  return {\n    step,\n    onStepChange: setStep,\n    submitUsernameAndPassword,\n    submitOneTimePassword: submitOneTimePassword,\n    errorMessage,\n    loginIsPending:\n      loginWithUsernameAndPasswordIsPending || loginWith2FACodeIsPending,\n    beginTwoFactorAuthReset,\n    twoFactorAuthResetIsPending,\n    twoFactorAuthResetIsSuccess,\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"useLogin.js","names":[],"sources":["../../../src/utils/hooks/useLogin.ts"],"sourcesContent":["import SynapseClient from '@/synapse-client'\nimport { useResetTwoFactorAuth } from '@/synapse-queries'\nimport {\n  instanceOfTwoFactorAuthErrorResponse,\n  TwoFactorAuthErrorResponse,\n} from '@sage-bionetworks/synapse-client/generated/models/TwoFactorAuthErrorResponse'\nimport { SynapseClientError } from '@sage-bionetworks/synapse-client/util/SynapseClientError'\nimport {\n  ErrorResponseCode,\n  LoginResponse,\n  TwoFactorAuthLoginRequest,\n  TwoFactorAuthOtpType,\n  TwoFactorAuthResetRequest,\n} from '@sage-bionetworks/synapse-types'\nimport { useMutation } from '@tanstack/react-query'\nimport { noop } from 'lodash-es'\nimport { Dispatch, SetStateAction, useEffect, useState } from 'react'\nimport { AUTHENTICATION_RECEIPT_LOCALSTORAGE_KEY } from '../SynapseConstants'\nimport { useOneSageURL } from './useOneSageURL'\nimport { ONE_TIME_PASSWORD_STEP } from '@/components/Authentication/OneTimePasswordForm'\nimport { TOTP_CLOCK_SKEW_ERROR_APPENDAGE } from '@/components/Authentication/Constants'\n\nexport type UseLoginOptions = {\n  sessionCallback?: () => void\n  twoFaErrorResponse?: TwoFactorAuthErrorResponse\n  /* If a twoFactorAuthError is encountered (including passed in the twoFactorAuthenticationRequired arg), this callback will be invoked */\n  onTwoFactorAuthRequired?: (\n    twoFaToken: Pick<TwoFactorAuthErrorResponse, 'twoFaToken' | 'userId'>,\n  ) => void\n}\n\nexport type UseLoginReturn = {\n  step:\n    | 'CHOOSE_AUTH_METHOD'\n    | 'USERNAME_PASSWORD'\n    | ONE_TIME_PASSWORD_STEP\n    | 'LOGGED_IN'\n  onStepChange: Dispatch<SetStateAction<UseLoginReturn['step']>>\n  submitUsernameAndPassword: (username: string, password: string) => void\n  submitOneTimePassword: (\n    code: string,\n    /* The type of one time password code that can be used to authenticate through two-factor authentication. Default is based on current value of `step` */\n    otpType?: TwoFactorAuthOtpType,\n  ) => void\n  /* Trigger sending an email which can be used to disable 2FA */\n  beginTwoFactorAuthReset: (twoFaResetEndpoint: string) => void\n  twoFactorAuthResetIsPending: boolean\n  twoFactorAuthResetIsSuccess: boolean\n  errorMessage: string | undefined\n  loginIsPending: boolean\n}\n\n// When prompting the user for a 2FA code, allow the UI to show only these steps\nconst VALID_STEPS_DURING_2FA_PROMPT: ReadonlySet<UseLoginReturn['step']> =\n  new Set([\n    'VERIFICATION_CODE',\n    'RECOVERY_CODE',\n    'LOGGED_IN',\n    'DISABLE_2FA_PROMPT',\n  ])\n\n/**\n * Stateful hook that manages logging into Synapse\n */\nexport default function useLogin(opts: UseLoginOptions): UseLoginReturn {\n  const {\n    sessionCallback = noop,\n    twoFaErrorResponse: twoFaErrorResponseFromProps,\n    onTwoFactorAuthRequired = noop,\n  } = opts\n  const [step, setStep] = useState<UseLoginReturn['step']>('CHOOSE_AUTH_METHOD')\n  const [errorMessage, setErrorMessage] = useState<string | undefined>()\n  const [twoFaErrorResponse, setTwoFaErrorResponse] = useState<\n    TwoFactorAuthErrorResponse | undefined\n  >()\n\n  const changePasswordUrl = useOneSageURL('/changePassword')\n  /**\n   * Update state variable if optional prop changes\n   */\n  useEffect(() => {\n    if (twoFaErrorResponseFromProps) {\n      setTwoFaErrorResponse(twoFaErrorResponseFromProps)\n    }\n  }, [twoFaErrorResponseFromProps])\n\n  /*\n   * In SWC, if logging in with OAuth, the servlet will call POST /oauth2/session2 to get the access token.\n   *\n   * If the user has 2FA enabled, the servlet will receive a 401 with the userId and twoFaToken in the response.\n   * The servlet will then redirect the user to the login page with the userId and twoFaToken in the searchParams.\n   *\n   * This effect will check if the search params are present, and change the step to 'VERIFICATION_CODE' if they are.\n   */\n  useEffect(() => {\n    const fullUrl: URL = new URL(window.location.href)\n\n    const { searchParams } = fullUrl\n    if (searchParams) {\n      const userId = searchParams.get('userId')\n      const twoFaToken = searchParams.get('twoFaToken')\n      if (userId && twoFaToken) {\n        setTwoFaErrorResponse({\n          errorCode: ErrorResponseCode.TWO_FA_REQUIRED,\n          reason: '',\n          userId: parseInt(userId, 10),\n          twoFaToken,\n          concreteType:\n            'org.sagebionetworks.repo.model.auth.TwoFactorAuthErrorResponse',\n        })\n        if (!VALID_STEPS_DURING_2FA_PROMPT.has(step)) {\n          setStep('VERIFICATION_CODE')\n        }\n      }\n    }\n  }, [step])\n\n  /*\n   * In client-only apps (like Portals), if logging in with OAuth, the client app will call POST /oauth2/session2 to get the access token.\n   *\n   * If the user has 2FA enabled, the client app will receive a 401 with the userId and twoFaToken in the response.\n   *\n   * The app can pass the error response as a prop/argument, and we'll use it here to jump straight to the VERIFICATION_CODE step.\n   */\n  useEffect(() => {\n    if (twoFaErrorResponse) {\n      setTwoFaErrorResponse(twoFaErrorResponse)\n      if (!VALID_STEPS_DURING_2FA_PROMPT.has(step)) {\n        setStep('VERIFICATION_CODE')\n      }\n    }\n    // We do NOT want to rerun this effect on step change. It should only run once, when we get the error.\n    // oxlint-disable-next-line react-hooks/exhaustive-deps\n  }, [twoFaErrorResponse])\n\n  /**\n   * Call the onTwoFactorAuthRequired callback when a twoFaToken is present\n   */\n  useEffect(() => {\n    if (twoFaErrorResponse) {\n      onTwoFactorAuthRequired(twoFaErrorResponse)\n    }\n  }, [onTwoFactorAuthRequired, twoFaErrorResponse])\n\n  /* When the step changes, clear the old error message. */\n  useEffect(() => {\n    setErrorMessage(undefined)\n  }, [step])\n\n  async function finishLogin(loginResponse: LoginResponse) {\n    await SynapseClient.setAccessTokenCookie(loginResponse.accessToken)\n    localStorage.setItem(\n      AUTHENTICATION_RECEIPT_LOCALSTORAGE_KEY,\n      loginResponse.authenticationReceipt ?? '',\n    )\n    setStep('LOGGED_IN')\n\n    if (sessionCallback) {\n      sessionCallback()\n    }\n  }\n\n  const {\n    mutate: mutateLoginWithUsernameAndPassword,\n    isPending: loginWithUsernameAndPasswordIsPending,\n  } = useMutation<\n    LoginResponse | TwoFactorAuthErrorResponse,\n    SynapseClientError,\n    { username: string; password: string; authenticationReceipt: string | null }\n  >({\n    mutationFn: ({ username, password, authenticationReceipt }) =>\n      SynapseClient.login(username, password, authenticationReceipt),\n    onError: error => {\n      setErrorMessage(error.reason)\n      const { errorResponse } = error\n      if (\n        errorResponse &&\n        'errorCode' in errorResponse &&\n        errorResponse.errorCode ==\n          ErrorResponseCode.PASSWORD_RESET_VIA_EMAIL_REQUIRED\n      ) {\n        window.location.assign(changePasswordUrl.toString())\n      }\n    },\n    onSuccess: async loginResponse => {\n      if (loginResponse) {\n        if (instanceOfTwoFactorAuthErrorResponse(loginResponse)) {\n          setStep('VERIFICATION_CODE')\n          setTwoFaErrorResponse(loginResponse)\n        } else {\n          await finishLogin(loginResponse)\n        }\n      }\n    },\n  })\n\n  const {\n    mutate: mutateLoginWith2FACode,\n    isPending: loginWith2FACodeIsPending,\n  } = useMutation<LoginResponse, SynapseClientError, TwoFactorAuthLoginRequest>(\n    {\n      mutationFn: request => SynapseClient.loginWith2fa(request),\n      onError: e => {\n        setErrorMessage(e.reason)\n        if (e.reason.includes('The provided code is invalid')) {\n          // The most common cause of an invalid TOTP code is clock skew between the user's device and the server.\n          setErrorMessage(`${e.reason} ${TOTP_CLOCK_SKEW_ERROR_APPENDAGE}`)\n        } else if (\n          // The twoFaToken wasn't transmitted correctly\n          e.reason.includes('The provided twoFaToken is invalid') ||\n          // The user waited too long to enter the code.\n          e.reason.includes('Token has expired')\n        ) {\n          console.warn(e)\n          // Instruct the user refresh to start over.\n          setErrorMessage(\n            'Something went wrong. Refresh the page and try again.',\n          )\n          // If the 2FA token is in the search parameters, remove it so the user doesn't just get the same error again.\n          if (window.location.href.includes('twoFaToken')) {\n            window.history.replaceState(\n              {},\n              document.title,\n              // using regex because SWC hashbang doesn't work with URLSearchParams\n              window.location.href.replaceAll(\n                /(twoFaToken|userId)=[^&]*&?/g,\n                '',\n              ),\n            )\n          }\n        }\n      },\n      onSuccess: finishLogin,\n    },\n  )\n\n  const {\n    mutate: resetTwoFactorAuth,\n    isSuccess: twoFactorAuthResetIsSuccess,\n    isPending: twoFactorAuthResetIsPending,\n  } = useResetTwoFactorAuth({\n    onError: e => {\n      setErrorMessage(e.reason)\n    },\n  })\n\n  const submitUsernameAndPassword: UseLoginReturn['submitUsernameAndPassword'] =\n    (username, password) => {\n      setErrorMessage(undefined)\n      const authenticationReceipt = localStorage.getItem(\n        AUTHENTICATION_RECEIPT_LOCALSTORAGE_KEY,\n      )\n      mutateLoginWithUsernameAndPassword({\n        username,\n        password,\n        authenticationReceipt,\n      })\n    }\n\n  function verifyTwoFaErrorIsPresent(\n    twoFaErrorResponse: TwoFactorAuthErrorResponse | null | undefined,\n  ): twoFaErrorResponse is TwoFactorAuthErrorResponse {\n    if (twoFaErrorResponse == null) {\n      // This type of error could happen if the 2FA component exists on its own route, and the user directly navigates to it without first logging in with credentials/OAuth\n      setErrorMessage(\n        'You did not first log in with your password or a third-party identity provider.',\n      )\n      return false\n    }\n    return true\n  }\n\n  const submitOneTimePassword: UseLoginReturn['submitOneTimePassword'] = (\n    code,\n    otpType = step === 'RECOVERY_CODE' ? 'RECOVERY_CODE' : 'TOTP',\n  ) => {\n    setErrorMessage(undefined)\n    if (verifyTwoFaErrorIsPresent(twoFaErrorResponse)) {\n      const request: TwoFactorAuthLoginRequest = {\n        userId: twoFaErrorResponse.userId!,\n        twoFaToken: twoFaErrorResponse.twoFaToken!,\n        otpCode: code,\n        otpType: otpType,\n      }\n      mutateLoginWith2FACode(request)\n    }\n  }\n\n  const beginTwoFactorAuthReset: UseLoginReturn['beginTwoFactorAuthReset'] = (\n    twoFaResetEndpoint: string,\n  ) => {\n    setErrorMessage(undefined)\n    if (verifyTwoFaErrorIsPresent(twoFaErrorResponse)) {\n      const request: TwoFactorAuthResetRequest = {\n        userId: twoFaErrorResponse.userId!,\n        twoFaToken: twoFaErrorResponse.twoFaToken,\n        twoFaResetEndpoint: twoFaResetEndpoint,\n      }\n      resetTwoFactorAuth(request)\n    }\n  }\n\n  return {\n    step,\n    onStepChange: setStep,\n    submitUsernameAndPassword,\n    submitOneTimePassword: submitOneTimePassword,\n    errorMessage,\n    loginIsPending:\n      loginWithUsernameAndPasswordIsPending || loginWith2FACodeIsPending,\n    beginTwoFactorAuthReset,\n    twoFactorAuthResetIsPending,\n    twoFactorAuthResetIsSuccess,\n  }\n}\n"],"mappings":"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"}

package/dist/utils/hooks/useUploadFileEntity/useCreateFolderPath.js.map

@@ -1 +1 @@
-{"version":3,"file":"useCreateFolderPath.js","names":[],"sources":["../../../../src/utils/hooks/useUploadFileEntity/useCreateFolderPath.ts"],"sourcesContent":["import {\n  useCreateEntity,\n  useGetEntityLookupQueryOptions,\n  useGetEntityQueryOptions,\n} from '@/synapse-queries/entity/useEntity'\nimport { useMutation, useQueryClient } from '@tanstack/react-query'\nimport {\n  convertToEntityType,\n  entityTypeToFriendlyName,\n} from '../../functions/EntityTypeUtils'\n\n/**\n * Given the ID of a container entity and a path string array, create the folder structure as necessary and return the ID of the final folder in the path.\n * @returns The ID of the final folder in the path.\n */\nexport function useCreateFolderPath() {\n  const { mutateAsync: createEntity } = useCreateEntity()\n\n  const queryClient = useQueryClient()\n  const getEntityLookupQueryOptions = useGetEntityLookupQueryOptions()\n  const getEntityQueryOptions = useGetEntityQueryOptions()\n\n  return useMutation({\n    mutationFn: async (args: { rootContainerId: string; path: string[] }) => {\n      const { rootContainerId: rootContainerId, path } = args\n      let parentId = rootContainerId\n      for (const pathElement of path) {\n        const foundEntityId = await queryClient.fetchQuery(\n          getEntityLookupQueryOptions({\n            parentId: parentId,\n            entityName: pathElement,\n          }),\n        )\n\n        if (foundEntityId) {\n          // Verify that this entity is a folder\n          const entity = await queryClient.fetchQuery(\n            getEntityQueryOptions(foundEntityId),\n          )\n\n          if (entity.concreteType != 'org.sagebionetworks.repo.model.Folder') {\n            const typeOfExistingEntity = convertToEntityType(\n              entity.concreteType,\n            )\n            throw new Error(\n              `A(n) ${entityTypeToFriendlyName(\n                typeOfExistingEntity,\n              )} named \"${pathElement}\" already exists in this location (${parentId}). A folder could not be created.`,\n            )\n          }\n\n          parentId = foundEntityId\n        } else {\n          // Create a new folder\n          const { id } = await createEntity({\n            concreteType: 'org.sagebionetworks.repo.model.Folder',\n            name: pathElement,\n            parentId: parentId,\n          })\n          parentId = id!\n        }\n      }\n\n      return parentId\n    },\n  })\n}\n"],"mappings":";;;;AAeA,SAAgB,IAAsB;CACpC,IAAM,EAAE,aAAa,MAAiB,EAAgB,GAEhD,IAAc,EAAe,GAC7B,IAA8B,EAA+B,GAC7D,IAAwB,EAAyB;CAEvD,OAAO,EAAY,EACjB,YAAY,OAAO,MAAsD;EACvE,IAAM,EAAmB,oBAAiB,YAAS,GAC/C,IAAW;EACf,KAAK,IAAM,KAAe,GAAM;GAC9B,IAAM,IAAgB,MAAM,EAAY,WACtC,EAA4B;IAChB;IACV,YAAY;GACd,CAAC,CACH;GAEA,IAAI,GAAe;IAEjB,IAAM,IAAS,MAAM,EAAY,WAC/B,EAAsB,CAAa,CACrC;IAEA,IAAI,EAAO,gBAAgB,yCAAyC;KAClE,IAAM,IAAuB,EAC3B,EAAO,YACT;KACA,MAAU,MACR,QAAQ,EACN,CACF,EAAE,UAAU,EAAY,qCAAqC,EAAS,kCACxE;IACF;IAEA,IAAW;GACb,OAAO;IAEL,IAAM,EAAE,UAAO,MAAM,EAAa;KAChC,cAAc;KACd,MAAM;KACI;IACZ,CAAC;IACD,IAAW;GACb;EACF;EAEA,OAAO;CACT,EACF,CAAC;AACH"}
+{"version":3,"file":"useCreateFolderPath.js","names":[],"sources":["../../../../src/utils/hooks/useUploadFileEntity/useCreateFolderPath.ts"],"sourcesContent":["import {\n  useCreateEntity,\n  useGetEntityLookupQueryOptions,\n  useGetEntityQueryOptions,\n} from '@/synapse-queries/entity/useEntity'\nimport { useMutation, useQueryClient } from '@tanstack/react-query'\nimport {\n  convertToEntityType,\n  entityTypeToFriendlyName,\n} from '../../functions/EntityTypeUtils'\n\n/**\n * Given the ID of a container entity and a path string array, create the folder structure as necessary and return the ID of the final folder in the path.\n * @returns The ID of the final folder in the path.\n */\nexport function useCreateFolderPath() {\n  const { mutateAsync: createEntity } = useCreateEntity()\n\n  const queryClient = useQueryClient()\n  const getEntityLookupQueryOptions = useGetEntityLookupQueryOptions()\n  const getEntityQueryOptions = useGetEntityQueryOptions()\n\n  return useMutation({\n    mutationFn: async (args: { rootContainerId: string; path: string[] }) => {\n      const { rootContainerId, path } = args\n      let parentId = rootContainerId\n      for (const pathElement of path) {\n        const foundEntityId = await queryClient.fetchQuery(\n          getEntityLookupQueryOptions({\n            parentId: parentId,\n            entityName: pathElement,\n          }),\n        )\n\n        if (foundEntityId) {\n          // Verify that this entity is a folder\n          const entity = await queryClient.fetchQuery(\n            getEntityQueryOptions(foundEntityId),\n          )\n\n          if (entity.concreteType != 'org.sagebionetworks.repo.model.Folder') {\n            const typeOfExistingEntity = convertToEntityType(\n              entity.concreteType,\n            )\n            throw new Error(\n              `A(n) ${entityTypeToFriendlyName(\n                typeOfExistingEntity,\n              )} named \"${pathElement}\" already exists in this location (${parentId}). A folder could not be created.`,\n            )\n          }\n\n          parentId = foundEntityId\n        } else {\n          // Create a new folder\n          const { id } = await createEntity({\n            concreteType: 'org.sagebionetworks.repo.model.Folder',\n            name: pathElement,\n            parentId: parentId,\n          })\n          parentId = id!\n        }\n      }\n\n      return parentId\n    },\n  })\n}\n"],"mappings":";;;;AAeA,SAAgB,IAAsB;CACpC,IAAM,EAAE,aAAa,MAAiB,EAAgB,GAEhD,IAAc,EAAe,GAC7B,IAA8B,EAA+B,GAC7D,IAAwB,EAAyB;CAEvD,OAAO,EAAY,EACjB,YAAY,OAAO,MAAsD;EACvE,IAAM,EAAE,oBAAiB,YAAS,GAC9B,IAAW;EACf,KAAK,IAAM,KAAe,GAAM;GAC9B,IAAM,IAAgB,MAAM,EAAY,WACtC,EAA4B;IAChB;IACV,YAAY;GACd,CAAC,CACH;GAEA,IAAI,GAAe;IAEjB,IAAM,IAAS,MAAM,EAAY,WAC/B,EAAsB,CAAa,CACrC;IAEA,IAAI,EAAO,gBAAgB,yCAAyC;KAClE,IAAM,IAAuB,EAC3B,EAAO,YACT;KACA,MAAU,MACR,QAAQ,EACN,CACF,EAAE,UAAU,EAAY,qCAAqC,EAAS,kCACxE;IACF;IAEA,IAAW;GACb,OAAO;IAEL,IAAM,EAAE,UAAO,MAAM,EAAa;KAChC,cAAc;KACd,MAAM;KACI;IACZ,CAAC;IACD,IAAW;GACb;EACF;EAEA,OAAO;CACT,EACF,CAAC;AACH"}

package/dist/utils/jsonschema/collectTopLevelProperties.d.ts

@@ -1,5 +1,11 @@
 import { JSONSchema7, JSONSchema7Definition } from 'json-schema';
+type Definitions = NonNullable<JSONSchema7['definitions']>;
 type TopLevelProperties = Record<string, JSONSchema7Definition>;
+/**
+ * Resolve a local `#/definitions/X` reference (or bare `X` key) against the root schema's `definitions`.
+ * Returns undefined for a dangling reference or a boolean schema.
+ */
+export declare function resolveRef(ref: string, definitions: Definitions | undefined): JSONSchema7 | undefined;
 /**
  * Collects the names that could appear as a top-level property of an instance validated by the given
  * JSON Schema, keyed by property name. Each value is the `$ref`-resolved schema for that property.

package/dist/utils/jsonschema/collectTopLevelProperties.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"collectTopLevelProperties.d.ts","sourceRoot":"","sources":["../../../src/utils/jsonschema/collectTopLevelProperties.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAA;AAKhE,KAAK,kBAAkB,GAAG,MAAM,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAA;AAmF/D;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,WAAW,GAAG,SAAS,GAC5B,kBAAkB,CAOpB"}
+{"version":3,"file":"collectTopLevelProperties.d.ts","sourceRoot":"","sources":["../../../src/utils/jsonschema/collectTopLevelProperties.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAA;AAIhE,KAAK,WAAW,GAAG,WAAW,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC,CAAA;AAC1D,KAAK,kBAAkB,GAAG,MAAM,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAA;AAY/D;;;GAGG;AACH,wBAAgB,UAAU,CACxB,GAAG,EAAE,MAAM,EACX,WAAW,EAAE,WAAW,GAAG,SAAS,GACnC,WAAW,GAAG,SAAS,CAIzB;AAgED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,WAAW,GAAG,SAAS,GAC5B,kBAAkB,CAOpB"}

package/dist/utils/jsonschema/collectTopLevelProperties.js

@@ -26,6 +26,6 @@ function a(e) {
 	return e && i(e, e.definitions, /* @__PURE__ */ new Set(), t), t;
 }
 //#endregion
-export { a as collectTopLevelProperties };
+export { a as collectTopLevelProperties, n as resolveRef };
 
 //# sourceMappingURL=collectTopLevelProperties.js.map

package/dist/utils/jsonschema/collectTopLevelProperties.js.map

@@ -1 +1 @@
-{"version":3,"file":"collectTopLevelProperties.js","names":[],"sources":["../../../src/utils/jsonschema/collectTopLevelProperties.ts"],"sourcesContent":["import { JSONSchema7, JSONSchema7Definition } from 'json-schema'\n\nconst DEFINITIONS_PREFIX = '#/definitions/'\n\ntype Definitions = NonNullable<JSONSchema7['definitions']>\ntype TopLevelProperties = Record<string, JSONSchema7Definition>\n\n/**\n * Given a full `#/definitions/X` reference, return the relative key (`X`) used in the definitions\n * map. A reference that is already a bare key is returned as-is.\n */\nfunction getRelativeRef(ref: string): string {\n  return ref.startsWith(DEFINITIONS_PREFIX)\n    ? ref.substring(DEFINITIONS_PREFIX.length)\n    : ref\n}\n\nfunction resolveRef(\n  ref: string,\n  definitions: Definitions | undefined,\n): JSONSchema7 | undefined {\n  const resolved = definitions?.[getRelativeRef(ref)]\n  // A boolean schema (`true`/`false`) carries no properties to collect\n  return typeof resolved === 'object' ? resolved : undefined\n}\n\n/**\n * Resolve a property value: if it is a `$ref` it is replaced with the referenced schema. A dangling\n * or unresolvable `$ref` returns the raw node so the property name is preserved with an unknown type.\n */\nfunction resolveProperty(\n  property: JSONSchema7Definition,\n  definitions: Definitions | undefined,\n): JSONSchema7Definition {\n  if (typeof property !== 'object' || !property.$ref) {\n    return property\n  }\n  return resolveRef(property.$ref, definitions) ?? property\n}\n\nfunction collect(\n  node: JSONSchema7Definition | undefined,\n  definitions: Definitions | undefined,\n  visitedRefs: Set<string>,\n  result: TopLevelProperties,\n): void {\n  if (typeof node !== 'object') {\n    return\n  }\n\n  // Follow a combination $ref to the schema it references. Nothing else on a $ref node contributes.\n  if (node.$ref) {\n    if (visitedRefs.has(node.$ref)) {\n      return\n    }\n    visitedRefs.add(node.$ref)\n    collect(\n      resolveRef(node.$ref, definitions),\n      definitions,\n      visitedRefs,\n      result,\n    )\n    return\n  }\n\n  if (node.properties) {\n    for (const [name, propertySchema] of Object.entries(node.properties)) {\n      if (!(name in result)) {\n        result[name] = resolveProperty(propertySchema, definitions)\n      }\n    }\n  }\n\n  // Recurse through combination keywords in a fixed, deterministic order.\n  node.allOf?.forEach(member =>\n    collect(member, definitions, visitedRefs, result),\n  )\n  node.anyOf?.forEach(member =>\n    collect(member, definitions, visitedRefs, result),\n  )\n  node.oneOf?.forEach(member =>\n    collect(member, definitions, visitedRefs, result),\n  )\n  collect(node.if, definitions, visitedRefs, result)\n  collect(node.then, definitions, visitedRefs, result)\n  collect(node.else, definitions, visitedRefs, result)\n}\n\n/**\n * Collects the names that could appear as a top-level property of an instance validated by the given\n * JSON Schema, keyed by property name. Each value is the `$ref`-resolved schema for that property.\n *\n * The walk follows schema combination keywords (`$ref`, `allOf`, `anyOf`, `oneOf`, `if`, `then`,\n * `else`) so that properties declared in referenced or composed sub-schemas are included. It does\n * NOT descend into a property's own value, `items`, `contains`, `additionalProperties`, or `not`, so\n * the nested properties of an object or the elements of an array are never surfaced as top-level\n * properties.\n *\n * Insertion order is the order in which properties were first encountered, and the first occurrence\n * of a name wins -- so a schema's own properties take precedence over composed/inherited ones.\n *\n * This mirrors the backend's `JsonSchemaProperties.collectTopLevelProperties`, which is what defines\n * a RecordSet's schema columns. Only draft-07 `definitions` references are resolved (not `$defs`),\n * matching that implementation.\n */\nexport function collectTopLevelProperties(\n  root: JSONSchema7 | undefined,\n): TopLevelProperties {\n  const result: TopLevelProperties = {}\n  if (!root) {\n    return result\n  }\n  collect(root, root.definitions, new Set<string>(), result)\n  return result\n}\n"],"mappings":";AAEA,IAAM,IAAqB;AAS3B,SAAS,EAAe,GAAqB;CAC3C,OAAO,EAAI,WAAW,CAAkB,IACpC,EAAI,UAAU,EAAyB,IACvC;AACN;AAEA,SAAS,EACP,GACA,GACyB;CACzB,IAAM,IAAW,IAAc,EAAe,CAAG;CAEjD,OAAO,OAAO,KAAa,WAAW,IAAW,KAAA;AACnD;AAMA,SAAS,EACP,GACA,GACuB;CAIvB,OAHI,OAAO,KAAa,YAAY,CAAC,EAAS,OACrC,IAEF,EAAW,EAAS,MAAM,CAAW,KAAK;AACnD;AAEA,SAAS,EACP,GACA,GACA,GACA,GACM;CACF,WAAO,KAAS,UAKpB;MAAI,EAAK,MAAM;GACb,IAAI,EAAY,IAAI,EAAK,IAAI,GAC3B;GAGF,AADA,EAAY,IAAI,EAAK,IAAI,GACzB,EACE,EAAW,EAAK,MAAM,CAAW,GACjC,GACA,GACA,CACF;GACA;EACF;EAEA,IAAI,EAAK,iBACF,IAAM,CAAC,GAAM,MAAmB,OAAO,QAAQ,EAAK,UAAU,GACjE,AAAM,KAAQ,MACZ,EAAO,KAAQ,EAAgB,GAAgB,CAAW;EAiBhE,AAXA,EAAK,OAAO,SAAQ,MAClB,EAAQ,GAAQ,GAAa,GAAa,CAAM,CAClD,GACA,EAAK,OAAO,SAAQ,MAClB,EAAQ,GAAQ,GAAa,GAAa,CAAM,CAClD,GACA,EAAK,OAAO,SAAQ,MAClB,EAAQ,GAAQ,GAAa,GAAa,CAAM,CAClD,GACA,EAAQ,EAAK,IAAI,GAAa,GAAa,CAAM,GACjD,EAAQ,EAAK,MAAM,GAAa,GAAa,CAAM,GACnD,EAAQ,EAAK,MAAM,GAAa,GAAa,CAAM;CAtBnD;AAuBF;AAmBA,SAAgB,EACd,GACoB;CACpB,IAAM,IAA6B,CAAC;CAKpC,OAJK,KAGL,EAAQ,GAAM,EAAK,6BAAa,IAAI,IAAY,GAAG,CAAM,GAFhD;AAIX"}
+{"version":3,"file":"collectTopLevelProperties.js","names":[],"sources":["../../../src/utils/jsonschema/collectTopLevelProperties.ts"],"sourcesContent":["import { JSONSchema7, JSONSchema7Definition } from 'json-schema'\n\nconst DEFINITIONS_PREFIX = '#/definitions/'\n\ntype Definitions = NonNullable<JSONSchema7['definitions']>\ntype TopLevelProperties = Record<string, JSONSchema7Definition>\n\n/**\n * Given a full `#/definitions/X` reference, return the relative key (`X`) used in the definitions\n * map. A reference that is already a bare key is returned as-is.\n */\nfunction getRelativeRef(ref: string): string {\n  return ref.startsWith(DEFINITIONS_PREFIX)\n    ? ref.substring(DEFINITIONS_PREFIX.length)\n    : ref\n}\n\n/**\n * Resolve a local `#/definitions/X` reference (or bare `X` key) against the root schema's `definitions`.\n * Returns undefined for a dangling reference or a boolean schema.\n */\nexport function resolveRef(\n  ref: string,\n  definitions: Definitions | undefined,\n): JSONSchema7 | undefined {\n  const resolved = definitions?.[getRelativeRef(ref)]\n  // A boolean schema (`true`/`false`) carries no properties to collect\n  return typeof resolved === 'object' ? resolved : undefined\n}\n\n/**\n * Resolve a property value: if it is a `$ref` it is replaced with the referenced schema. A dangling\n * or unresolvable `$ref` returns the raw node so the property name is preserved with an unknown type.\n */\nfunction resolveProperty(\n  property: JSONSchema7Definition,\n  definitions: Definitions | undefined,\n): JSONSchema7Definition {\n  if (typeof property !== 'object' || !property.$ref) {\n    return property\n  }\n  return resolveRef(property.$ref, definitions) ?? property\n}\n\nfunction collect(\n  node: JSONSchema7Definition | undefined,\n  definitions: Definitions | undefined,\n  visitedRefs: Set<string>,\n  result: TopLevelProperties,\n): void {\n  if (typeof node !== 'object') {\n    return\n  }\n\n  // Follow a combination $ref to the schema it references. Nothing else on a $ref node contributes.\n  if (node.$ref) {\n    if (visitedRefs.has(node.$ref)) {\n      return\n    }\n    visitedRefs.add(node.$ref)\n    collect(\n      resolveRef(node.$ref, definitions),\n      definitions,\n      visitedRefs,\n      result,\n    )\n    return\n  }\n\n  if (node.properties) {\n    for (const [name, propertySchema] of Object.entries(node.properties)) {\n      if (!(name in result)) {\n        result[name] = resolveProperty(propertySchema, definitions)\n      }\n    }\n  }\n\n  // Recurse through combination keywords in a fixed, deterministic order.\n  node.allOf?.forEach(member =>\n    collect(member, definitions, visitedRefs, result),\n  )\n  node.anyOf?.forEach(member =>\n    collect(member, definitions, visitedRefs, result),\n  )\n  node.oneOf?.forEach(member =>\n    collect(member, definitions, visitedRefs, result),\n  )\n  collect(node.if, definitions, visitedRefs, result)\n  collect(node.then, definitions, visitedRefs, result)\n  collect(node.else, definitions, visitedRefs, result)\n}\n\n/**\n * Collects the names that could appear as a top-level property of an instance validated by the given\n * JSON Schema, keyed by property name. Each value is the `$ref`-resolved schema for that property.\n *\n * The walk follows schema combination keywords (`$ref`, `allOf`, `anyOf`, `oneOf`, `if`, `then`,\n * `else`) so that properties declared in referenced or composed sub-schemas are included. It does\n * NOT descend into a property's own value, `items`, `contains`, `additionalProperties`, or `not`, so\n * the nested properties of an object or the elements of an array are never surfaced as top-level\n * properties.\n *\n * Insertion order is the order in which properties were first encountered, and the first occurrence\n * of a name wins -- so a schema's own properties take precedence over composed/inherited ones.\n *\n * This mirrors the backend's `JsonSchemaProperties.collectTopLevelProperties`, which is what defines\n * a RecordSet's schema columns. Only draft-07 `definitions` references are resolved (not `$defs`),\n * matching that implementation.\n */\nexport function collectTopLevelProperties(\n  root: JSONSchema7 | undefined,\n): TopLevelProperties {\n  const result: TopLevelProperties = {}\n  if (!root) {\n    return result\n  }\n  collect(root, root.definitions, new Set<string>(), result)\n  return result\n}\n"],"mappings":";AAEA,IAAM,IAAqB;AAS3B,SAAS,EAAe,GAAqB;CAC3C,OAAO,EAAI,WAAW,CAAkB,IACpC,EAAI,UAAU,EAAyB,IACvC;AACN;AAMA,SAAgB,EACd,GACA,GACyB;CACzB,IAAM,IAAW,IAAc,EAAe,CAAG;CAEjD,OAAO,OAAO,KAAa,WAAW,IAAW,KAAA;AACnD;AAMA,SAAS,EACP,GACA,GACuB;CAIvB,OAHI,OAAO,KAAa,YAAY,CAAC,EAAS,OACrC,IAEF,EAAW,EAAS,MAAM,CAAW,KAAK;AACnD;AAEA,SAAS,EACP,GACA,GACA,GACA,GACM;CACF,WAAO,KAAS,UAKpB;MAAI,EAAK,MAAM;GACb,IAAI,EAAY,IAAI,EAAK,IAAI,GAC3B;GAGF,AADA,EAAY,IAAI,EAAK,IAAI,GACzB,EACE,EAAW,EAAK,MAAM,CAAW,GACjC,GACA,GACA,CACF;GACA;EACF;EAEA,IAAI,EAAK,iBACF,IAAM,CAAC,GAAM,MAAmB,OAAO,QAAQ,EAAK,UAAU,GACjE,AAAM,KAAQ,MACZ,EAAO,KAAQ,EAAgB,GAAgB,CAAW;EAiBhE,AAXA,EAAK,OAAO,SAAQ,MAClB,EAAQ,GAAQ,GAAa,GAAa,CAAM,CAClD,GACA,EAAK,OAAO,SAAQ,MAClB,EAAQ,GAAQ,GAAa,GAAa,CAAM,CAClD,GACA,EAAK,OAAO,SAAQ,MAClB,EAAQ,GAAQ,GAAa,GAAa,CAAM,CAClD,GACA,EAAQ,EAAK,IAAI,GAAa,GAAa,CAAM,GACjD,EAAQ,EAAK,MAAM,GAAa,GAAa,CAAM,GACnD,EAAQ,EAAK,MAAM,GAAa,GAAa,CAAM;CAtBnD;AAuBF;AAmBA,SAAgB,EACd,GACoB;CACpB,IAAM,IAA6B,CAAC;CAKpC,OAJK,KAGL,EAAQ,GAAM,EAAK,6BAAa,IAAI,IAAY,GAAG,CAAM,GAFhD;AAIX"}

package/dist/utils/jsonschema/getNumberOrEnumInfo.d.ts

@@ -0,0 +1,22 @@
+import { JSONSchema7, JSONSchema7Definition } from 'json-schema';
+export type NumberOrEnumInfo = {
+    numericType: 'number' | 'integer';
+    enumValues: string[];
+};
+type Definitions = JSONSchema7['definitions'];
+/**
+ * Detects a property whose values are either a number or one of a closed set of
+ * strings, such as a masked age (`43` or ">= 90") or a measurement that may be
+ * "N/A". The property must be an `anyOf` (or `oneOf`) with exactly one `number`
+ * or `integer` branch and one or more branches that each allow only strings,
+ * through an `enum` or a `const`. Branches may appear in any order, may be local
+ * `#/definitions/` references, and may be accompanied by `null` branches.
+ *
+ * @param propertySchema the schema of a single property
+ * @param definitions the root schema's `definitions`, used to resolve `$ref` branches
+ * @returns the numeric branch's type and the allowed strings, or null if the
+ * property is not such a union
+ */
+export declare function getNumberOrEnumInfo(propertySchema: JSONSchema7Definition | undefined, definitions?: Definitions): NumberOrEnumInfo | null;
+export {};
+//# sourceMappingURL=getNumberOrEnumInfo.d.ts.map

package/dist/utils/jsonschema/getNumberOrEnumInfo.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getNumberOrEnumInfo.d.ts","sourceRoot":"","sources":["../../../src/utils/jsonschema/getNumberOrEnumInfo.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAA;AAIhE,MAAM,MAAM,gBAAgB,GAAG;IAC7B,WAAW,EAAE,QAAQ,GAAG,SAAS,CAAA;IACjC,UAAU,EAAE,MAAM,EAAE,CAAA;CACrB,CAAA;AAED,KAAK,WAAW,GAAG,WAAW,CAAC,aAAa,CAAC,CAAA;AA+B7C;;;;;;;;;;;;GAYG;AACH,wBAAgB,mBAAmB,CACjC,cAAc,EAAE,qBAAqB,GAAG,SAAS,EACjD,WAAW,CAAC,EAAE,WAAW,GACxB,gBAAgB,GAAG,IAAI,CAoCzB"}

package/dist/utils/jsonschema/getNumberOrEnumInfo.js

@@ -0,0 +1,39 @@
+import { resolveRef as e } from "./collectTopLevelProperties.js";
+import { isSchemaDescribingNullType as t } from "./getOnlyNonNullOneOfOption.js";
+//#region src/utils/jsonschema/getNumberOrEnumInfo.ts
+function n(t, n) {
+	if (typeof t == "object") return t.$ref ? e(t.$ref, n) : t;
+}
+function r(e) {
+	return e.type === "number" || e.type === "integer" ? e.type : void 0;
+}
+function i(e) {
+	if (e.type !== void 0 && e.type !== "string") return;
+	let t = e.enum ?? (e.const === void 0 ? [] : [e.const]);
+	return t.length > 0 && t.every((e) => typeof e == "string") ? t : void 0;
+}
+function a(e, a) {
+	if (typeof e != "object") return null;
+	let o = e.anyOf ?? e.oneOf;
+	if (!o) return null;
+	let s, c = /* @__PURE__ */ new Set(), l = o.map((e) => n(e, a)).filter((e) => !t(e));
+	for (let e of l) {
+		if (!e) return null;
+		let t = r(e);
+		if (t && !s) {
+			s = t;
+			continue;
+		}
+		let n = i(e);
+		if (!n) return null;
+		n.forEach((e) => c.add(e));
+	}
+	return s && c.size > 0 ? {
+		numericType: s,
+		enumValues: [...c]
+	} : null;
+}
+//#endregion
+export { a as getNumberOrEnumInfo };
+
+//# sourceMappingURL=getNumberOrEnumInfo.js.map

package/dist/utils/jsonschema/getNumberOrEnumInfo.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getNumberOrEnumInfo.js","names":[],"sources":["../../../src/utils/jsonschema/getNumberOrEnumInfo.ts"],"sourcesContent":["import { JSONSchema7, JSONSchema7Definition } from 'json-schema'\nimport { resolveRef } from './collectTopLevelProperties'\nimport { isSchemaDescribingNullType } from './getOnlyNonNullOneOfOption'\n\nexport type NumberOrEnumInfo = {\n  numericType: 'number' | 'integer'\n  enumValues: string[]\n}\n\ntype Definitions = JSONSchema7['definitions']\n\nfunction resolveBranch(\n  branch: JSONSchema7Definition,\n  definitions: Definitions,\n): JSONSchema7 | undefined {\n  if (typeof branch !== 'object') {\n    return undefined\n  }\n  return branch.$ref ? resolveRef(branch.$ref, definitions) : branch\n}\n\nfunction getNumericType(\n  branch: JSONSchema7,\n): NumberOrEnumInfo['numericType'] | undefined {\n  return branch.type === 'number' || branch.type === 'integer'\n    ? branch.type\n    : undefined\n}\n\nfunction getStringEnumValues(branch: JSONSchema7): string[] | undefined {\n  if (branch.type !== undefined && branch.type !== 'string') {\n    return undefined\n  }\n  const values =\n    branch.enum ?? (branch.const !== undefined ? [branch.const] : [])\n  return values.length > 0 && values.every(value => typeof value === 'string')\n    ? values\n    : undefined\n}\n\n/**\n * Detects a property whose values are either a number or one of a closed set of\n * strings, such as a masked age (`43` or \">= 90\") or a measurement that may be\n * \"N/A\". The property must be an `anyOf` (or `oneOf`) with exactly one `number`\n * or `integer` branch and one or more branches that each allow only strings,\n * through an `enum` or a `const`. Branches may appear in any order, may be local\n * `#/definitions/` references, and may be accompanied by `null` branches.\n *\n * @param propertySchema the schema of a single property\n * @param definitions the root schema's `definitions`, used to resolve `$ref` branches\n * @returns the numeric branch's type and the allowed strings, or null if the\n * property is not such a union\n */\nexport function getNumberOrEnumInfo(\n  propertySchema: JSONSchema7Definition | undefined,\n  definitions?: Definitions,\n): NumberOrEnumInfo | null {\n  if (typeof propertySchema !== 'object') {\n    return null\n  }\n  const branches = propertySchema.anyOf ?? propertySchema.oneOf\n  if (!branches) {\n    return null\n  }\n\n  let numericType: NumberOrEnumInfo['numericType'] | undefined\n  const enumValues = new Set<string>()\n  const nonNullBranches = branches\n    .map(branch => resolveBranch(branch, definitions))\n    .filter(branch => !isSchemaDescribingNullType(branch))\n\n  for (const branch of nonNullBranches) {\n    if (!branch) {\n      return null\n    }\n    const branchNumericType = getNumericType(branch)\n    if (branchNumericType && !numericType) {\n      numericType = branchNumericType\n      continue\n    }\n    // Any branch that is neither the numeric branch nor a closed set of strings\n    // (including a second numeric branch) makes the union something else\n    const branchValues = getStringEnumValues(branch)\n    if (!branchValues) {\n      return null\n    }\n    branchValues.forEach(value => enumValues.add(value))\n  }\n\n  return numericType && enumValues.size > 0\n    ? { numericType, enumValues: [...enumValues] }\n    : null\n}\n"],"mappings":";;;AAWA,SAAS,EACP,GACA,GACyB;CACrB,WAAO,KAAW,UAGtB,OAAO,EAAO,OAAO,EAAW,EAAO,MAAM,CAAW,IAAI;AAC9D;AAEA,SAAS,EACP,GAC6C;CAC7C,OAAO,EAAO,SAAS,YAAY,EAAO,SAAS,YAC/C,EAAO,OACP,KAAA;AACN;AAEA,SAAS,EAAoB,GAA2C;CACtE,IAAI,EAAO,SAAS,KAAA,KAAa,EAAO,SAAS,UAC/C;CAEF,IAAM,IACJ,EAAO,SAAS,EAAO,UAAU,KAAA,IAA6B,CAAC,IAAlB,CAAC,EAAO,KAAK;CAC5D,OAAO,EAAO,SAAS,KAAK,EAAO,OAAM,MAAS,OAAO,KAAU,QAAQ,IACvE,IACA,KAAA;AACN;AAeA,SAAgB,EACd,GACA,GACyB;CACzB,IAAI,OAAO,KAAmB,UAC5B,OAAO;CAET,IAAM,IAAW,EAAe,SAAS,EAAe;CACxD,IAAI,CAAC,GACH,OAAO;CAGT,IAAI,GACE,oBAAa,IAAI,IAAY,GAC7B,IAAkB,EACrB,KAAI,MAAU,EAAc,GAAQ,CAAW,CAAC,EAChD,QAAO,MAAU,CAAC,EAA2B,CAAM,CAAC;CAEvD,KAAK,IAAM,KAAU,GAAiB;EACpC,IAAI,CAAC,GACH,OAAO;EAET,IAAM,IAAoB,EAAe,CAAM;EAC/C,IAAI,KAAqB,CAAC,GAAa;GACrC,IAAc;GACd;EACF;EAGA,IAAM,IAAe,EAAoB,CAAM;EAC/C,IAAI,CAAC,GACH,OAAO;EAET,EAAa,SAAQ,MAAS,EAAW,IAAI,CAAK,CAAC;CACrD;CAEA,OAAO,KAAe,EAAW,OAAO,IACpC;EAAE;EAAa,YAAY,CAAC,GAAG,CAAU;CAAE,IAC3C;AACN"}

package/dist/utils/jsonschema/getOnlyNonNullOneOfOption.d.ts

@@ -1,2 +1,3 @@
+export declare function isSchemaDescribingNullType(s: any): boolean;
 export declare function getOnlyNonNullOneOfOption(jsonSchema: Record<string, unknown>): Record<string, unknown> | undefined;
 //# sourceMappingURL=getOnlyNonNullOneOfOption.d.ts.map

package/dist/utils/jsonschema/getOnlyNonNullOneOfOption.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getOnlyNonNullOneOfOption.d.ts","sourceRoot":"","sources":["../../../src/utils/jsonschema/getOnlyNonNullOneOfOption.ts"],"names":[],"mappings":"AAYA,wBAAgB,yBAAyB,CACvC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAClC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAgBrC"}
+{"version":3,"file":"getOnlyNonNullOneOfOption.d.ts","sourceRoot":"","sources":["../../../src/utils/jsonschema/getOnlyNonNullOneOfOption.ts"],"names":[],"mappings":"AAIA,wBAAgB,0BAA0B,CAAC,CAAC,EAAE,GAAG,WAMhD;AAED,wBAAgB,yBAAyB,CACvC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAClC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAgBrC"}

package/dist/utils/jsonschema/getOnlyNonNullOneOfOption.js

@@ -12,6 +12,6 @@ function i(e) {
 	}
 }
 //#endregion
-export { i as getOnlyNonNullOneOfOption };
+export { i as getOnlyNonNullOneOfOption, r as isSchemaDescribingNullType };
 
 //# sourceMappingURL=getOnlyNonNullOneOfOption.js.map

package/dist/utils/jsonschema/getOnlyNonNullOneOfOption.js.map

@@ -1 +1 @@
-{"version":3,"file":"getOnlyNonNullOneOfOption.js","names":[],"sources":["../../../src/utils/jsonschema/getOnlyNonNullOneOfOption.ts"],"sourcesContent":["import isArray from 'lodash-es/isArray'\nimport isEqual from 'lodash-es/isEqual'\nimport isObject from 'lodash-es/isObject'\n\nfunction isSchemaDescribingNullType(s: any) {\n  return (\n    isObject(s) &&\n    'type' in s &&\n    (s.type == 'null' || isEqual(s.type, ['null']))\n  )\n}\n\nexport function getOnlyNonNullOneOfOption(\n  jsonSchema: Record<string, unknown>,\n): Record<string, unknown> | undefined {\n  if (jsonSchema?.oneOf && isArray(jsonSchema.oneOf)) {\n    // PORTALS-3723\n    // Also handle our special 'oneOf' enum case just like in `getEnumeratedValues`\n    const oneOfSchemasOmitNulltype = jsonSchema.oneOf.filter(\n      s => !isSchemaDescribingNullType(s),\n    )\n    if (\n      oneOfSchemasOmitNulltype.length == 1 &&\n      isObject(oneOfSchemasOmitNulltype[0])\n    ) {\n      return oneOfSchemasOmitNulltype[0] as Record<string, unknown>\n    }\n  }\n\n  return undefined\n}\n"],"mappings":";;;;AAIA,SAAS,EAA2B,GAAQ;CAC1C,OACE,EAAS,CAAC,KACV,UAAU,MACT,EAAE,QAAQ,UAAU,EAAQ,EAAE,MAAM,CAAC,MAAM,CAAC;AAEjD;AAEA,SAAgB,EACd,GACqC;CACrC,IAAI,GAAY,SAAS,EAAQ,EAAW,KAAK,GAAG;EAGlD,IAAM,IAA2B,EAAW,MAAM,QAChD,MAAK,CAAC,EAA2B,CAAC,CACpC;EACA,IACE,EAAyB,UAAU,KACnC,EAAS,EAAyB,EAAE,GAEpC,OAAO,EAAyB;CAEpC;AAGF"}
+{"version":3,"file":"getOnlyNonNullOneOfOption.js","names":[],"sources":["../../../src/utils/jsonschema/getOnlyNonNullOneOfOption.ts"],"sourcesContent":["import isArray from 'lodash-es/isArray'\nimport isEqual from 'lodash-es/isEqual'\nimport isObject from 'lodash-es/isObject'\n\nexport function isSchemaDescribingNullType(s: any) {\n  return (\n    isObject(s) &&\n    'type' in s &&\n    (s.type == 'null' || isEqual(s.type, ['null']))\n  )\n}\n\nexport function getOnlyNonNullOneOfOption(\n  jsonSchema: Record<string, unknown>,\n): Record<string, unknown> | undefined {\n  if (jsonSchema?.oneOf && isArray(jsonSchema.oneOf)) {\n    // PORTALS-3723\n    // Also handle our special 'oneOf' enum case just like in `getEnumeratedValues`\n    const oneOfSchemasOmitNulltype = jsonSchema.oneOf.filter(\n      s => !isSchemaDescribingNullType(s),\n    )\n    if (\n      oneOfSchemasOmitNulltype.length == 1 &&\n      isObject(oneOfSchemasOmitNulltype[0])\n    ) {\n      return oneOfSchemasOmitNulltype[0] as Record<string, unknown>\n    }\n  }\n\n  return undefined\n}\n"],"mappings":";;;;AAIA,SAAgB,EAA2B,GAAQ;CACjD,OACE,EAAS,CAAC,KACV,UAAU,MACT,EAAE,QAAQ,UAAU,EAAQ,EAAE,MAAM,CAAC,MAAM,CAAC;AAEjD;AAEA,SAAgB,EACd,GACqC;CACrC,IAAI,GAAY,SAAS,EAAQ,EAAW,KAAK,GAAG;EAGlD,IAAM,IAA2B,EAAW,MAAM,QAChD,MAAK,CAAC,EAA2B,CAAC,CACpC;EACA,IACE,EAAyB,UAAU,KACnC,EAAS,EAAyB,EAAE,GAEpC,OAAO,EAAyB;CAEpC;AAGF"}

package/dist/utils/jsonschema/getSchemaPropertyInfo.d.ts

@@ -6,6 +6,11 @@ export interface SchemaPropertyInfo {
     isRequired: boolean;
     enumeratedValues: EnumeratedValue[] | null;
     description?: string;
+    /**
+     * True when the property is either a number of the given `type` or one of the
+     * strings in `enumeratedValues`; see {@link getNumberOrEnumInfo}
+     */
+    isNumberOrEnum?: boolean;
 }
 export interface SchemaPropertiesMap {
     [propertyName: string]: SchemaPropertyInfo;

package/dist/utils/jsonschema/getSchemaPropertyInfo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getSchemaPropertyInfo.d.ts","sourceRoot":"","sources":["../../../src/utils/jsonschema/getSchemaPropertyInfo.ts"],"names":[],"mappings":"AAAA,OAA4B,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAG5E,OAAO,EAAE,YAAY,EAAmB,MAAM,WAAW,CAAA;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAEzC,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,YAAY,GAAG,SAAS,CAAA;IAC9B,UAAU,EAAE,OAAO,CAAA;IACnB,gBAAgB,EAAE,eAAe,EAAE,GAAG,IAAI,CAAA;IAC1C,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB;AAED,MAAM,WAAW,mBAAmB;IAClC,CAAC,YAAY,EAAE,MAAM,GAAG,kBAAkB,CAAA;CAC3C;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,WAAW,GAAG,IAAI,GACzB,mBAAmB,CAqCrB"}
+{"version":3,"file":"getSchemaPropertyInfo.d.ts","sourceRoot":"","sources":["../../../src/utils/jsonschema/getSchemaPropertyInfo.ts"],"names":[],"mappings":"AAAA,OAA4B,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAI5E,OAAO,EAAE,YAAY,EAAmB,MAAM,WAAW,CAAA;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAEzC,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,YAAY,GAAG,SAAS,CAAA;IAC9B,UAAU,EAAE,OAAO,CAAA;IACnB,gBAAgB,EAAE,eAAe,EAAE,GAAG,IAAI,CAAA;IAC1C,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB;;;OAGG;IACH,cAAc,CAAC,EAAE,OAAO,CAAA;CACzB;AAED,MAAM,WAAW,mBAAmB;IAClC,CAAC,YAAY,EAAE,MAAM,GAAG,kBAAkB,CAAA;CAC3C;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,WAAW,GAAG,IAAI,GACzB,mBAAmB,CA0DrB"}

package/dist/utils/jsonschema/getSchemaPropertyInfo.js

@@ -1,22 +1,37 @@
 import e from "./getEnumeratedValues.js";
-import t from "./getRequiredAttributes.js";
-import n from "./getSchemaForProperty.js";
-import { getFlatTypeInfo as r } from "./getType.js";
+import { getNumberOrEnumInfo as t } from "./getNumberOrEnumInfo.js";
+import n from "./getRequiredAttributes.js";
+import r from "./getSchemaForProperty.js";
+import { getFlatTypeInfo as i } from "./getType.js";
 //#region src/utils/jsonschema/getSchemaPropertyInfo.ts
-function i(i) {
-	if (!i) return {};
-	let a = t(i), o = {};
-	return i.properties && Object.keys(i.properties).forEach((t) => {
-		let s = n(i, t), c = r(s), l = e(s).map((e) => e.value);
-		l.length === 0 && s?.items && (l = e(Array.isArray(s.items) ? s.items[0] : s.items).map((e) => e.value)), o[t] = {
-			type: c,
-			isRequired: a.includes(t),
-			enumeratedValues: l.length > 0 ? l : null,
-			description: s?.description
+function a(a) {
+	if (!a) return {};
+	let o = n(a), s = {};
+	return a.properties && Object.keys(a.properties).forEach((n) => {
+		let c = r(a, n), l = t(c, a.definitions);
+		if (l) {
+			s[n] = {
+				type: {
+					...i(c),
+					type: l.numericType
+				},
+				isRequired: o.includes(n),
+				enumeratedValues: l.enumValues,
+				description: c?.description,
+				isNumberOrEnum: !0
+			};
+			return;
+		}
+		let u = i(c), d = e(c).map((e) => e.value);
+		d.length === 0 && c?.items && (d = e(Array.isArray(c.items) ? c.items[0] : c.items).map((e) => e.value)), s[n] = {
+			type: u,
+			isRequired: o.includes(n),
+			enumeratedValues: d.length > 0 ? d : null,
+			description: c?.description
 		};
-	}), o;
+	}), s;
 }
 //#endregion
-export { i as getSchemaPropertiesInfo };
+export { a as getSchemaPropertiesInfo };
 
 //# sourceMappingURL=getSchemaPropertyInfo.js.map

package/dist/utils/jsonschema/getSchemaPropertyInfo.js.map

@@ -1 +1 @@
-{"version":3,"file":"getSchemaPropertyInfo.js","names":[],"sources":["../../../src/utils/jsonschema/getSchemaPropertyInfo.ts"],"sourcesContent":["import getEnumeratedValues, { EnumeratedValue } from './getEnumeratedValues'\nimport getSchemaForProperty from './getSchemaForProperty'\nimport getRequiredAttributes from './getRequiredAttributes'\nimport { FlatTypeInfo, getFlatTypeInfo } from './getType'\nimport { JSONSchema7 } from 'json-schema'\n\nexport interface SchemaPropertyInfo {\n  type: FlatTypeInfo | undefined\n  isRequired: boolean\n  enumeratedValues: EnumeratedValue[] | null\n  description?: string\n}\n\nexport interface SchemaPropertiesMap {\n  [propertyName: string]: SchemaPropertyInfo\n}\n\n/**\n * Processes a JSON schema once and returns information for all properties\n * @param schema The JSON schema to process\n * @returns A map of property names to their schema information\n */\nexport function getSchemaPropertiesInfo(\n  schema: JSONSchema7 | null,\n): SchemaPropertiesMap {\n  if (!schema) {\n    return {}\n  }\n\n  const requiredFields = getRequiredAttributes(schema)\n  const propertiesMap: SchemaPropertiesMap = {}\n\n  // Process each property in the schema\n  if (schema.properties) {\n    Object.keys(schema.properties).forEach(propertyName => {\n      const propertySchema = getSchemaForProperty(schema, propertyName)\n      const type = getFlatTypeInfo(propertySchema)\n      let enumeratedValues = getEnumeratedValues(propertySchema).map(\n        item => item.value,\n      )\n\n      // Check for nested enums in array items\n      if (enumeratedValues.length === 0 && propertySchema?.items) {\n        const itemsSchema = Array.isArray(propertySchema.items)\n          ? propertySchema.items[0]\n          : propertySchema.items\n        enumeratedValues = getEnumeratedValues(itemsSchema).map(\n          item => item.value,\n        )\n      }\n\n      propertiesMap[propertyName] = {\n        type,\n        isRequired: requiredFields.includes(propertyName),\n        enumeratedValues: enumeratedValues.length > 0 ? enumeratedValues : null,\n        description: propertySchema?.description,\n      }\n    })\n  }\n\n  return propertiesMap\n}\n"],"mappings":";;;;;AAsBA,SAAgB,EACd,GACqB;CACrB,IAAI,CAAC,GACH,OAAO,CAAC;CAGV,IAAM,IAAiB,EAAsB,CAAM,GAC7C,IAAqC,CAAC;CA8B5C,OA3BI,EAAO,cACT,OAAO,KAAK,EAAO,UAAU,EAAE,SAAQ,MAAgB;EACrD,IAAM,IAAiB,EAAqB,GAAQ,CAAY,GAC1D,IAAO,EAAgB,CAAc,GACvC,IAAmB,EAAoB,CAAc,EAAE,KACzD,MAAQ,EAAK,KACf;EAYA,AATI,EAAiB,WAAW,KAAK,GAAgB,UAInD,IAAmB,EAHC,MAAM,QAAQ,EAAe,KAAK,IAClD,EAAe,MAAM,KACrB,EAAe,KAC+B,EAAE,KAClD,MAAQ,EAAK,KACf,IAGF,EAAc,KAAgB;GAC5B;GACA,YAAY,EAAe,SAAS,CAAY;GAChD,kBAAkB,EAAiB,SAAS,IAAI,IAAmB;GACnE,aAAa,GAAgB;EAC/B;CACF,CAAC,GAGI;AACT"}
+{"version":3,"file":"getSchemaPropertyInfo.js","names":[],"sources":["../../../src/utils/jsonschema/getSchemaPropertyInfo.ts"],"sourcesContent":["import getEnumeratedValues, { EnumeratedValue } from './getEnumeratedValues'\nimport { getNumberOrEnumInfo } from './getNumberOrEnumInfo'\nimport getSchemaForProperty from './getSchemaForProperty'\nimport getRequiredAttributes from './getRequiredAttributes'\nimport { FlatTypeInfo, getFlatTypeInfo } from './getType'\nimport { JSONSchema7 } from 'json-schema'\n\nexport interface SchemaPropertyInfo {\n  type: FlatTypeInfo | undefined\n  isRequired: boolean\n  enumeratedValues: EnumeratedValue[] | null\n  description?: string\n  /**\n   * True when the property is either a number of the given `type` or one of the\n   * strings in `enumeratedValues`; see {@link getNumberOrEnumInfo}\n   */\n  isNumberOrEnum?: boolean\n}\n\nexport interface SchemaPropertiesMap {\n  [propertyName: string]: SchemaPropertyInfo\n}\n\n/**\n * Processes a JSON schema once and returns information for all properties\n * @param schema The JSON schema to process\n * @returns A map of property names to their schema information\n */\nexport function getSchemaPropertiesInfo(\n  schema: JSONSchema7 | null,\n): SchemaPropertiesMap {\n  if (!schema) {\n    return {}\n  }\n\n  const requiredFields = getRequiredAttributes(schema)\n  const propertiesMap: SchemaPropertiesMap = {}\n\n  // Process each property in the schema\n  if (schema.properties) {\n    Object.keys(schema.properties).forEach(propertyName => {\n      const propertySchema = getSchemaForProperty(schema, propertyName)\n\n      const numberOrEnum = getNumberOrEnumInfo(\n        propertySchema,\n        schema.definitions,\n      )\n      if (numberOrEnum) {\n        // A number-or-enum union describes neither a single type nor an\n        // enumeration, so both come from its detected branches.\n        propertiesMap[propertyName] = {\n          type: {\n            ...getFlatTypeInfo(propertySchema),\n            type: numberOrEnum.numericType,\n          },\n          isRequired: requiredFields.includes(propertyName),\n          enumeratedValues: numberOrEnum.enumValues,\n          description: propertySchema?.description,\n          isNumberOrEnum: true,\n        }\n        return\n      }\n\n      const type = getFlatTypeInfo(propertySchema)\n      let enumeratedValues = getEnumeratedValues(propertySchema).map(\n        item => item.value,\n      )\n\n      // Check for nested enums in array items\n      if (enumeratedValues.length === 0 && propertySchema?.items) {\n        const itemsSchema = Array.isArray(propertySchema.items)\n          ? propertySchema.items[0]\n          : propertySchema.items\n        enumeratedValues = getEnumeratedValues(itemsSchema).map(\n          item => item.value,\n        )\n      }\n\n      propertiesMap[propertyName] = {\n        type,\n        isRequired: requiredFields.includes(propertyName),\n        enumeratedValues: enumeratedValues.length > 0 ? enumeratedValues : null,\n        description: propertySchema?.description,\n      }\n    })\n  }\n\n  return propertiesMap\n}\n"],"mappings":";;;;;;AA4BA,SAAgB,EACd,GACqB;CACrB,IAAI,CAAC,GACH,OAAO,CAAC;CAGV,IAAM,IAAiB,EAAsB,CAAM,GAC7C,IAAqC,CAAC;CAmD5C,OAhDI,EAAO,cACT,OAAO,KAAK,EAAO,UAAU,EAAE,SAAQ,MAAgB;EACrD,IAAM,IAAiB,EAAqB,GAAQ,CAAY,GAE1D,IAAe,EACnB,GACA,EAAO,WACT;EACA,IAAI,GAAc;GAGhB,EAAc,KAAgB;IAC5B,MAAM;KACJ,GAAG,EAAgB,CAAc;KACjC,MAAM,EAAa;IACrB;IACA,YAAY,EAAe,SAAS,CAAY;IAChD,kBAAkB,EAAa;IAC/B,aAAa,GAAgB;IAC7B,gBAAgB;GAClB;GACA;EACF;EAEA,IAAM,IAAO,EAAgB,CAAc,GACvC,IAAmB,EAAoB,CAAc,EAAE,KACzD,MAAQ,EAAK,KACf;EAYA,AATI,EAAiB,WAAW,KAAK,GAAgB,UAInD,IAAmB,EAHC,MAAM,QAAQ,EAAe,KAAK,IAClD,EAAe,MAAM,KACrB,EAAe,KAC+B,EAAE,KAClD,MAAQ,EAAK,KACf,IAGF,EAAc,KAAgB;GAC5B;GACA,YAAY,EAAe,SAAS,CAAY;GAChD,kBAAkB,EAAiB,SAAS,IAAI,IAAmB;GACnE,aAAa,GAAgB;EAC/B;CACF,CAAC,GAGI;AACT"}

package/dist/utils/jsonschema/submissionContext.js

@@ -38,10 +38,10 @@ function i(e) {
 function a(e) {
 	if (!e.startsWith("/")) return null;
 	let t = e.slice(1);
-	return !t || t.includes("/") ? null : t.replace(/~1/g, "/").replace(/~0/g, "~");
+	return !t || t.includes("/") ? null : t.replaceAll("~1", "/").replaceAll("~0", "~");
 }
 function o(e) {
-	return `/${e.replace(/~/g, "~0").replace(/\//g, "~1")}`;
+	return `/${e.replaceAll("~", "~0").replaceAll("/", "~1")}`;
 }
 function s(e, t) {
 	let n = a(t);