@milaboratories/pl-model-common 1.47.2 → 1.48.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (95) hide show
  1. package/dist/bmodel/block_kind_ref.cjs +45 -0
  2. package/dist/bmodel/block_kind_ref.cjs.map +1 -0
  3. package/dist/bmodel/block_kind_ref.d.ts +57 -0
  4. package/dist/bmodel/block_kind_ref.d.ts.map +1 -0
  5. package/dist/bmodel/block_kind_ref.js +43 -0
  6. package/dist/bmodel/block_kind_ref.js.map +1 -0
  7. package/dist/bmodel/container.d.ts +8 -0
  8. package/dist/bmodel/container.d.ts.map +1 -1
  9. package/dist/bmodel/index.cjs +4 -0
  10. package/dist/bmodel/index.d.ts +2 -1
  11. package/dist/bmodel/index.js +2 -1
  12. package/dist/columns/dedup.cjs +1 -1
  13. package/dist/columns/dedup.cjs.map +1 -1
  14. package/dist/columns/dedup.d.ts +1 -1
  15. package/dist/columns/dedup.js +1 -1
  16. package/dist/columns/dedup.js.map +1 -1
  17. package/dist/columns/providers.cjs +1 -1
  18. package/dist/columns/providers.cjs.map +1 -1
  19. package/dist/columns/providers.d.ts +1 -1
  20. package/dist/columns/providers.js +1 -1
  21. package/dist/columns/providers.js.map +1 -1
  22. package/dist/drivers/index.cjs +4 -0
  23. package/dist/drivers/index.d.ts +2 -2
  24. package/dist/drivers/index.js +2 -2
  25. package/dist/drivers/pframe/data_types.cjs.map +1 -1
  26. package/dist/drivers/pframe/data_types.d.ts +24 -0
  27. package/dist/drivers/pframe/data_types.d.ts.map +1 -1
  28. package/dist/drivers/pframe/data_types.js.map +1 -1
  29. package/dist/drivers/pframe/index.cjs +4 -0
  30. package/dist/drivers/pframe/index.d.ts +2 -2
  31. package/dist/drivers/pframe/index.js +2 -2
  32. package/dist/drivers/pframe/spec/ids.cjs +151 -0
  33. package/dist/drivers/pframe/spec/ids.cjs.map +1 -1
  34. package/dist/drivers/pframe/spec/ids.d.ts +53 -1
  35. package/dist/drivers/pframe/spec/ids.d.ts.map +1 -1
  36. package/dist/drivers/pframe/spec/ids.js +150 -3
  37. package/dist/drivers/pframe/spec/ids.js.map +1 -1
  38. package/dist/drivers/pframe/spec/index.cjs +4 -0
  39. package/dist/drivers/pframe/spec/index.d.ts +2 -2
  40. package/dist/drivers/pframe/spec/index.js +2 -2
  41. package/dist/index.cjs +29 -0
  42. package/dist/index.d.ts +7 -2
  43. package/dist/index.js +8 -2
  44. package/dist/plid.cjs +1 -1
  45. package/dist/plid.cjs.map +1 -1
  46. package/dist/plid.d.ts +3 -2
  47. package/dist/plid.d.ts.map +1 -1
  48. package/dist/plid.js +1 -1
  49. package/dist/plid.js.map +1 -1
  50. package/dist/template/index.cjs +20 -0
  51. package/dist/template/index.d.ts +5 -0
  52. package/dist/template/index.js +5 -0
  53. package/dist/template/kind_selector.cjs +92 -0
  54. package/dist/template/kind_selector.cjs.map +1 -0
  55. package/dist/template/kind_selector.d.ts +80 -0
  56. package/dist/template/kind_selector.d.ts.map +1 -0
  57. package/dist/template/kind_selector.js +87 -0
  58. package/dist/template/kind_selector.js.map +1 -0
  59. package/dist/template/project_template_v1.cjs +231 -0
  60. package/dist/template/project_template_v1.cjs.map +1 -0
  61. package/dist/template/project_template_v1.d.ts +215 -0
  62. package/dist/template/project_template_v1.d.ts.map +1 -0
  63. package/dist/template/project_template_v1.js +225 -0
  64. package/dist/template/project_template_v1.js.map +1 -0
  65. package/dist/template/template_ref_form.cjs +73 -0
  66. package/dist/template/template_ref_form.cjs.map +1 -0
  67. package/dist/template/template_ref_form.d.ts +74 -0
  68. package/dist/template/template_ref_form.d.ts.map +1 -0
  69. package/dist/template/template_ref_form.js +72 -0
  70. package/dist/template/template_ref_form.js.map +1 -0
  71. package/dist/template/template_relocate.cjs +46 -0
  72. package/dist/template/template_relocate.cjs.map +1 -0
  73. package/dist/template/template_relocate.d.ts +32 -0
  74. package/dist/template/template_relocate.d.ts.map +1 -0
  75. package/dist/template/template_relocate.js +46 -0
  76. package/dist/template/template_relocate.js.map +1 -0
  77. package/package.json +5 -5
  78. package/src/bmodel/block_kind_ref.ts +59 -0
  79. package/src/bmodel/container.ts +9 -0
  80. package/src/bmodel/index.ts +1 -0
  81. package/src/columns/dedup.ts +1 -1
  82. package/src/columns/providers.ts +1 -1
  83. package/src/drivers/pframe/data_types.ts +24 -0
  84. package/src/drivers/pframe/spec/ids.test.ts +90 -0
  85. package/src/drivers/pframe/spec/ids.ts +191 -1
  86. package/src/index.ts +1 -0
  87. package/src/plid.ts +5 -5
  88. package/src/template/index.ts +4 -0
  89. package/src/template/kind_selector.ts +126 -0
  90. package/src/template/project_template_v1.test.ts +315 -0
  91. package/src/template/project_template_v1.ts +444 -0
  92. package/src/template/template_ref_form.test.ts +86 -0
  93. package/src/template/template_ref_form.ts +108 -0
  94. package/src/template/template_relocate.test.ts +182 -0
  95. package/src/template/template_relocate.ts +61 -0
@@ -1 +1 @@
1
- {"version":3,"file":"ids.js","names":[],"sources":["../../../../src/drivers/pframe/spec/ids.ts"],"sourcesContent":["import type { AnchoredPColumnId } from \"./selectors\";\nimport {\n applyAxisFilters,\n isColumnFilteredKey,\n type ColumnFilteredId,\n type ColumnFilteredKey,\n type FilteredPColumnId,\n} from \"./filtered_column\";\nimport {\n createPObjectId,\n isPObjectId,\n isPObjectKey,\n LocalPObjectKey,\n type GlobalPObjectId,\n type GlobalPObjectKey,\n type LocalPObjectId,\n type PObjectId,\n} from \"../../../pool\";\nimport {\n isColumnDiscoveredKey,\n type ColumnDiscoveredId,\n type ColumnDiscoveredKey,\n} from \"./discovered_column\";\nimport { throwError } from \"@milaboratories/helpers\";\nimport {\n applySpecOverrides,\n isColumnOverriddenKey,\n type ColumnOverriddenId,\n type ColumnOverriddenKey,\n} from \"./overridden\";\nimport { canonicalizeJson } from \"../../../json\";\nimport { AxisSpec, PColumnSpec } from \"./spec\";\nimport { isString } from \"es-toolkit\";\n\n/**\n * Per-axis patches keyed by positional index in the base spec's `axesSpec`.\n *\n * Using position rather than `name` lets us disambiguate linker-style specs\n * that carry multiple axes with the same `name` differentiated by `domain` /\n * `contextDomain` (e.g. a `group`, `group/primary`, `group/secondary` triple).\n *\n * A patch at index `>= base.axesSpec.length` appends a new axis at that slot.\n */\nexport type AxisPatches = Record<number, Partial<AxisSpec>>;\n\n/**\n * Universal column identifier optionally anchored and optionally filtered.\n * @deprecated use {@link ColumnUniversalKey}\n */\nexport type UniversalPColumnId = AnchoredPColumnId | FilteredPColumnId;\n\n/**\n * Canonically serialized {@link UniversalPColumnId}.\n * @deprecated use {@link ColumnUniversalId}\n */\nexport type SUniversalPColumnId = ColumnUniversalId;\n// export type SUniversalPColumnId = Branded<PObjectId, \"SUniversalPColumnId\", \"__pl_model_brand_2__\">;\n\nexport type ColumnUniversalKey =\n | LocalPObjectKey\n | GlobalPObjectKey\n | ColumnFilteredKey\n | ColumnDiscoveredKey\n | ColumnOverriddenKey;\n\nexport type ColumnUniversalId =\n | LocalPObjectId\n | GlobalPObjectId\n | ColumnFilteredId\n | ColumnDiscoveredId\n | ColumnOverriddenId;\n\n/**\n * Canonically serializes a column key to a branded string id. Accepts both\n * the new {@link ColumnUniversalKey} and the deprecated {@link UniversalPColumnId}\n * (anchored / old filtered object form).\n */\nexport function stringifyColumnId(id: ColumnUniversalKey | UniversalPColumnId): ColumnUniversalId {\n return canonicalizeJson(id) as ColumnUniversalId;\n}\n\n/**\n * Parses a canonically serialized column id back to its key form.\n */\nexport function parseColumnId(str: ColumnUniversalId): ColumnUniversalKey {\n return JSON.parse(str) as ColumnUniversalKey;\n}\n\nexport function parseColumnIdSafely(\n str: ColumnUniversalId,\n fallback = undefined,\n): ColumnUniversalKey | typeof fallback {\n try {\n return JSON.parse(str) as ColumnUniversalKey;\n } catch {\n return fallback;\n }\n}\n\n/**\n * Walk a rich column id down to its terminal leaf {@link PObjectId}.\n */\nexport function extractPObjectId(id: ColumnUniversalId | ColumnUniversalKey): PObjectId {\n if (isString(id)) {\n if (isPObjectId(id)) return id;\n\n const parsed =\n parseColumnIdSafely(id) ??\n throwError(`extractPObjectId: id \"${id}\" is not a valid canonical column id`);\n return extractPObjectId(parsed);\n }\n\n if (isPObjectKey(id)) return createPObjectId(id);\n if (isColumnFilteredKey(id)) return extractPObjectId(id.source);\n if (isColumnOverriddenKey(id)) return extractPObjectId(id.source);\n if (isColumnDiscoveredKey(id)) return extractPObjectId(id.column);\n\n throw new Error(`extractPObjectId: unrecognized column id structure: ${JSON.stringify(id)}`);\n}\n\n/**\n * Reconstruct the effective {@link PColumnSpec} for a rich column id by walking\n * the id chain from leaf to outermost wrapper, applying each layer's spec\n * transformation in the same order the corresponding recipe would.\n *\n * Layer semantics:\n * - Leaf ({@link LocalPObjectKey} / {@link GlobalPObjectKey}): no transformation.\n * - {@link ColumnDiscoveredKey}: pass-through, descends into `column`.\n * - {@link ColumnFilteredKey}: drops the axes whose positional index appears in\n * `axisFilters[i][0]` from the inner spec's `axesSpec` — mirrors\n * `ColumnFilteredRecipe.getSpec()`.\n * - {@link ColumnOverriddenKey}: applies `specOverrides` via\n * {@link applySpecOverrides} on top of the inner spec.\n */\nexport function reconstructSpecFromId(\n baseSpec: PColumnSpec,\n id: ColumnUniversalId | ColumnUniversalKey,\n): PColumnSpec {\n if (isString(id)) {\n if (isPObjectId(id)) return baseSpec;\n\n const parsed =\n parseColumnIdSafely(id) ??\n throwError(`reconstructSpecFromId: id \"${id}\" is not a valid canonical column id`);\n return reconstructSpecFromId(baseSpec, parsed);\n }\n\n if (isPObjectKey(id)) return baseSpec;\n if (isColumnDiscoveredKey(id)) return reconstructSpecFromId(baseSpec, id.column);\n if (isColumnFilteredKey(id)) {\n return applyAxisFilters(reconstructSpecFromId(baseSpec, id.source), id.axisFilters);\n }\n if (isColumnOverriddenKey(id)) {\n const inner = reconstructSpecFromId(baseSpec, id.source);\n return applySpecOverrides(inner, id.specOverrides);\n }\n\n throw new Error(`reconstructSpecFromId: unrecognized column id structure: ${JSON.stringify(id)}`);\n}\n"],"mappings":";;;;;;;;;;;;;;AA6EA,SAAgB,kBAAkB,IAAgE;CAChG,OAAO,iBAAiB,EAAE;AAC5B;;;;AAKA,SAAgB,cAAc,KAA4C;CACxE,OAAO,KAAK,MAAM,GAAG;AACvB;AAEA,SAAgB,oBACd,KACA,WAAW,KAAA,GAC2B;CACtC,IAAI;EACF,OAAO,KAAK,MAAM,GAAG;CACvB,QAAQ;EACN,OAAO;CACT;AACF;;;;AAKA,SAAgB,iBAAiB,IAAuD;CACtF,IAAI,SAAS,EAAE,GAAG;EAChB,IAAI,YAAY,EAAE,GAAG,OAAO;EAK5B,OAAO,iBAFL,oBAAoB,EAAE,KACtB,WAAW,yBAAyB,GAAG,qCAAqC,CAChD;CAChC;CAEA,IAAI,aAAa,EAAE,GAAG,OAAO,gBAAgB,EAAE;CAC/C,IAAI,oBAAoB,EAAE,GAAG,OAAO,iBAAiB,GAAG,MAAM;CAC9D,IAAI,sBAAsB,EAAE,GAAG,OAAO,iBAAiB,GAAG,MAAM;CAChE,IAAI,sBAAsB,EAAE,GAAG,OAAO,iBAAiB,GAAG,MAAM;CAEhE,MAAM,IAAI,MAAM,uDAAuD,KAAK,UAAU,EAAE,GAAG;AAC7F;;;;;;;;;;;;;;;AAgBA,SAAgB,sBACd,UACA,IACa;CACb,IAAI,SAAS,EAAE,GAAG;EAChB,IAAI,YAAY,EAAE,GAAG,OAAO;EAK5B,OAAO,sBAAsB,UAF3B,oBAAoB,EAAE,KACtB,WAAW,8BAA8B,GAAG,qCAAqC,CACtC;CAC/C;CAEA,IAAI,aAAa,EAAE,GAAG,OAAO;CAC7B,IAAI,sBAAsB,EAAE,GAAG,OAAO,sBAAsB,UAAU,GAAG,MAAM;CAC/E,IAAI,oBAAoB,EAAE,GACxB,OAAO,iBAAiB,sBAAsB,UAAU,GAAG,MAAM,GAAG,GAAG,WAAW;CAEpF,IAAI,sBAAsB,EAAE,GAE1B,OAAO,mBADO,sBAAsB,UAAU,GAAG,MACnB,GAAG,GAAG,aAAa;CAGnD,MAAM,IAAI,MAAM,4DAA4D,KAAK,UAAU,EAAE,GAAG;AAClG"}
1
+ {"version":3,"file":"ids.js","names":[],"sources":["../../../../src/drivers/pframe/spec/ids.ts"],"sourcesContent":["import type { AnchoredPColumnId } from \"./selectors\";\nimport {\n applyAxisFilters,\n isColumnFilteredKey,\n type ColumnFilteredId,\n type ColumnFilteredKey,\n type FilteredPColumnId,\n} from \"./filtered_column\";\nimport {\n createPObjectId,\n isGlobalPObjectKey,\n isLocalPObjectKey,\n isPObjectId,\n isPObjectKey,\n LocalPObjectKey,\n type GlobalPObjectId,\n type GlobalPObjectKey,\n type LocalPObjectId,\n type PObjectId,\n} from \"../../../pool\";\nimport {\n isColumnDiscoveredKey,\n type ColumnDiscoveredId,\n type ColumnDiscoveredKey,\n} from \"./discovered_column\";\nimport { throwError } from \"@milaboratories/helpers\";\nimport {\n applySpecOverrides,\n isColumnOverriddenKey,\n type ColumnOverriddenId,\n type ColumnOverriddenKey,\n} from \"./overridden\";\nimport { canonicalizeJson, parseJsonSafely } from \"../../../json\";\nimport { AxisSpec, PColumnSpec } from \"./spec\";\nimport { isString } from \"es-toolkit\";\n\n/**\n * Per-axis patches keyed by positional index in the base spec's `axesSpec`.\n *\n * Using position rather than `name` lets us disambiguate linker-style specs\n * that carry multiple axes with the same `name` differentiated by `domain` /\n * `contextDomain` (e.g. a `group`, `group/primary`, `group/secondary` triple).\n *\n * A patch at index `>= base.axesSpec.length` appends a new axis at that slot.\n */\nexport type AxisPatches = Record<number, Partial<AxisSpec>>;\n\n/**\n * Universal column identifier optionally anchored and optionally filtered.\n * @deprecated use {@link ColumnUniversalKey}\n */\nexport type UniversalPColumnId = AnchoredPColumnId | FilteredPColumnId;\n\n/**\n * Canonically serialized {@link UniversalPColumnId}.\n * @deprecated use {@link ColumnUniversalId}\n */\nexport type SUniversalPColumnId = ColumnUniversalId;\n// export type SUniversalPColumnId = Branded<PObjectId, \"SUniversalPColumnId\", \"__pl_model_brand_2__\">;\n\nexport type ColumnUniversalKey =\n | LocalPObjectKey\n | GlobalPObjectKey\n | ColumnFilteredKey\n | ColumnDiscoveredKey\n | ColumnOverriddenKey;\n\nexport type ColumnUniversalId =\n | LocalPObjectId\n | GlobalPObjectId\n | ColumnFilteredId\n | ColumnDiscoveredId\n | ColumnOverriddenId;\n\n/**\n * Canonically serializes a column key to a branded string id. Accepts both\n * the new {@link ColumnUniversalKey} and the deprecated {@link UniversalPColumnId}\n * (anchored / old filtered object form).\n */\nexport function stringifyColumnId(id: ColumnUniversalKey | UniversalPColumnId): ColumnUniversalId {\n return canonicalizeJson(id) as ColumnUniversalId;\n}\n\n/**\n * Parses a canonically serialized column id back to its key form.\n */\nexport function parseColumnId(str: ColumnUniversalId): ColumnUniversalKey {\n return JSON.parse(str) as ColumnUniversalKey;\n}\n\nexport function parseColumnIdSafely(\n str: ColumnUniversalId,\n fallback = undefined,\n): ColumnUniversalKey | typeof fallback {\n try {\n return JSON.parse(str) as ColumnUniversalKey;\n } catch {\n return fallback;\n }\n}\n\n/** Whether `value` is any of the five key forms a {@link ColumnUniversalId} serializes. */\nexport function isColumnUniversalKey(value: unknown): value is ColumnUniversalKey {\n return (\n isPObjectKey(value) ||\n isColumnFilteredKey(value) ||\n isColumnDiscoveredKey(value) ||\n isColumnOverriddenKey(value)\n );\n}\n\nexport function isColumnUniversalId(value: unknown): value is ColumnUniversalId {\n const key = isString(value) ? parseJsonSafely(value, false) : false;\n return key === false ? false : isColumnUniversalKey(key);\n}\n\n/**\n * A JSON string with its escape padding taken off, and how many passes that took.\n *\n * `layers` counts the `JSON.stringify` passes *above* the encoded value: a canonical id\n * is `layers: 0`, the same id run through `JSON.stringify` once more is `layers: 1`. Keep\n * it to put the value back the way it was found.\n */\nexport type PeeledJsonLayers = {\n readonly value: unknown;\n readonly layers: number;\n};\n\n/**\n * Take a value out of however many `JSON.stringify` passes wrapped it, or `undefined`\n * when `s` is not JSON at all.\n *\n * The one definition of \"how a value can be hiding inside a string\" — a block id can sit\n * under several layers of escaping, and a walk over object properties reaches none of\n * them. Callers differ in what they do at the bottom (this deliberately says nothing\n * about which values count as identifiers), but they must agree on the mechanics, or\n * \"what carries a block id\" ends up with two answers that drift.\n *\n * The gate is cheap and does NOT require any marker in the body: a filtered id whose\n * innermost leaf is a {@link LocalPObjectKey} carries no `__isRef`, so demanding one\n * would miss it.\n */\nexport function peelJsonLayers(s: string): PeeledJsonLayers | undefined {\n let current = s;\n let layers = 0;\n for (;;) {\n const c0 = current.charCodeAt(0);\n if (c0 !== 0x7b /* { */ && c0 !== 0x22 /* \" */) return undefined;\n let parsed: unknown;\n try {\n parsed = JSON.parse(current);\n } catch {\n return undefined;\n }\n // A pass that yielded another string was escape padding, so peel again. The string\n // is strictly shorter each time, which is what bounds the loop.\n if (isString(parsed)) {\n if (parsed.length >= current.length) return undefined;\n current = parsed;\n layers++;\n continue;\n }\n return { value: parsed, layers };\n }\n}\n\n/**\n * Rewrite every block id buried inside a column id.\n *\n * A {@link GlobalPObjectKey} leaf names its upstream by block id, and the wrapper key forms\n * nest by *string* id rather than by object — so a block id can sit under several layers of\n * JSON escaping, and `queriesQualifications` carries one in a map *key*. A caller that only\n * walks object properties never reaches any of them, which is why moving a column id between\n * projects needs this rather than a generic walk.\n *\n * Recursion re-canonicalizes bottom-up, so every level is canonical afterwards — including\n * the rebuilt `queriesQualifications`, whose keys the canonical form sorts. That is the\n * property a textual rewrite cannot have: redirecting an id that is a map key changes what\n * the sorted order should be, and only rebuilding restores it.\n *\n * Returns the input itself when no block id changed, so a caller mapping ids to themselves\n * gets its value back byte-for-byte and never re-serializes a stored id. Any `string` is\n * accepted for the same reason: a caller sweeping a params object cannot know which of its\n * strings are ids, and one that is not is returned as-is.\n *\n * @param remapBlockId old block id → new block id. Throw from it to reject an id that cannot\n * be mapped.\n */\nexport function remapColumnIdBlockIds<T extends string | ColumnUniversalKey>(\n id: T,\n remapBlockId: (blockId: string) => string,\n): T {\n const remapped = isString(id) ? remapIdString(id, remapBlockId) : remapKey(id, remapBlockId);\n return (remapped ?? id) as T;\n}\n\n/**\n * The string half of {@link remapColumnIdBlockIds}. `undefined` means \"nothing to change\",\n * which is what keeps an unaffected id from being re-serialized.\n *\n * Escape padding is peeled and put back, so an id that reached params through an extra\n * `JSON.stringify` is rewritten in place and comes back wrapped as it was found. A string\n * that does not peel to a column key is left alone: params hold ordinary strings too.\n */\nfunction remapIdString(id: string, remapBlockId: (blockId: string) => string): string | undefined {\n const peeled = peelJsonLayers(id);\n if (peeled === undefined || !isColumnUniversalKey(peeled.value)) return undefined;\n\n const remappedKey = remapKey(peeled.value, remapBlockId);\n if (remappedKey === undefined) return undefined;\n\n let rebuilt: string = stringifyColumnId(remappedKey);\n for (let layer = 0; layer < peeled.layers; layer++) rebuilt = JSON.stringify(rebuilt);\n return rebuilt;\n}\n\n/** The key half of {@link remapColumnIdBlockIds}. `undefined` means \"nothing to change\". */\nfunction remapKey(\n key: ColumnUniversalKey,\n remapBlockId: (blockId: string) => string,\n): ColumnUniversalKey | undefined {\n if (isGlobalPObjectKey(key)) {\n const blockId = remapBlockId(key.blockId);\n return blockId === key.blockId ? undefined : { ...key, blockId };\n }\n\n // A local leaf names its column by a path inside its own block — no block id.\n if (isLocalPObjectKey(key)) return undefined;\n\n if (isColumnFilteredKey(key)) {\n const source = remapIdString(key.source, remapBlockId);\n return source === undefined ? undefined : { ...key, source: source as ColumnUniversalId };\n }\n\n if (isColumnOverriddenKey(key)) {\n const source = remapIdString(key.source, remapBlockId);\n // Remapping preserves the id's shape, so `source` is still not an Overridden id.\n return source === undefined\n ? undefined\n : { ...key, source: source as ColumnOverriddenKey[\"source\"] };\n }\n\n if (isColumnDiscoveredKey(key)) return remapDiscoveredKey(key, remapBlockId);\n\n throw new Error(\n `remapColumnIdBlockIds: unrecognized column id structure: ${JSON.stringify(key)}`,\n );\n}\n\n/**\n * Discovered is the only key form carrying more than one nested id: the column it\n * discovered, one per linker hop, and one per entry in `queriesQualifications` — where the\n * id is the map key, not the value.\n */\nfunction remapDiscoveredKey(\n key: ColumnDiscoveredKey,\n remapBlockId: (blockId: string) => string,\n): ColumnDiscoveredKey | undefined {\n const column = remapIdString(key.column, remapBlockId);\n\n let pathChanged = false;\n const path = key.path?.map((item) => {\n const itemColumn = remapIdString(item.column, remapBlockId);\n if (itemColumn === undefined) return item;\n pathChanged = true;\n return { ...item, column: itemColumn as ColumnUniversalId };\n });\n\n let queriesChanged = false;\n const queriesQualifications =\n key.queriesQualifications &&\n (Object.fromEntries(\n Object.entries(key.queriesQualifications).map(([queryId, qualifications]) => {\n const remappedId = remapIdString(queryId, remapBlockId);\n if (remappedId === undefined) return [queryId, qualifications];\n queriesChanged = true;\n return [remappedId, qualifications];\n }),\n ) as ColumnDiscoveredKey[\"queriesQualifications\"]);\n\n if (column === undefined && !pathChanged && !queriesChanged) return undefined;\n return {\n ...key,\n ...(column !== undefined ? { column: column as ColumnUniversalId } : {}),\n ...(pathChanged ? { path } : {}),\n ...(queriesChanged ? { queriesQualifications } : {}),\n };\n}\n\n/**\n * Walk a rich column id down to its terminal leaf {@link PObjectId}.\n */\nexport function extractPObjectId(id: ColumnUniversalId | ColumnUniversalKey): PObjectId {\n if (isString(id)) {\n if (isPObjectId(id)) return id;\n\n const parsed =\n parseColumnIdSafely(id) ??\n throwError(`extractPObjectId: id \"${id}\" is not a valid canonical column id`);\n return extractPObjectId(parsed);\n }\n\n if (isPObjectKey(id)) return createPObjectId(id);\n if (isColumnFilteredKey(id)) return extractPObjectId(id.source);\n if (isColumnOverriddenKey(id)) return extractPObjectId(id.source);\n if (isColumnDiscoveredKey(id)) return extractPObjectId(id.column);\n\n throw new Error(`extractPObjectId: unrecognized column id structure: ${JSON.stringify(id)}`);\n}\n\n/**\n * Reconstruct the effective {@link PColumnSpec} for a rich column id by walking\n * the id chain from leaf to outermost wrapper, applying each layer's spec\n * transformation in the same order the corresponding recipe would.\n *\n * Layer semantics:\n * - Leaf ({@link LocalPObjectKey} / {@link GlobalPObjectKey}): no transformation.\n * - {@link ColumnDiscoveredKey}: pass-through, descends into `column`.\n * - {@link ColumnFilteredKey}: drops the axes whose positional index appears in\n * `axisFilters[i][0]` from the inner spec's `axesSpec` — mirrors\n * `ColumnFilteredRecipe.getSpec()`.\n * - {@link ColumnOverriddenKey}: applies `specOverrides` via\n * {@link applySpecOverrides} on top of the inner spec.\n */\nexport function reconstructSpecFromId(\n baseSpec: PColumnSpec,\n id: ColumnUniversalId | ColumnUniversalKey,\n): PColumnSpec {\n if (isString(id)) {\n if (isPObjectId(id)) return baseSpec;\n\n const parsed =\n parseColumnIdSafely(id) ??\n throwError(`reconstructSpecFromId: id \"${id}\" is not a valid canonical column id`);\n return reconstructSpecFromId(baseSpec, parsed);\n }\n\n if (isPObjectKey(id)) return baseSpec;\n if (isColumnDiscoveredKey(id)) return reconstructSpecFromId(baseSpec, id.column);\n if (isColumnFilteredKey(id)) {\n return applyAxisFilters(reconstructSpecFromId(baseSpec, id.source), id.axisFilters);\n }\n if (isColumnOverriddenKey(id)) {\n const inner = reconstructSpecFromId(baseSpec, id.source);\n return applySpecOverrides(inner, id.specOverrides);\n }\n\n throw new Error(`reconstructSpecFromId: unrecognized column id structure: ${JSON.stringify(id)}`);\n}\n"],"mappings":";;;;;;;;;;;;;;AA+EA,SAAgB,kBAAkB,IAAgE;CAChG,OAAO,iBAAiB,EAAE;AAC5B;;;;AAKA,SAAgB,cAAc,KAA4C;CACxE,OAAO,KAAK,MAAM,GAAG;AACvB;AAEA,SAAgB,oBACd,KACA,WAAW,KAAA,GAC2B;CACtC,IAAI;EACF,OAAO,KAAK,MAAM,GAAG;CACvB,QAAQ;EACN,OAAO;CACT;AACF;;AAGA,SAAgB,qBAAqB,OAA6C;CAChF,OACE,aAAa,KAAK,KAClB,oBAAoB,KAAK,KACzB,sBAAsB,KAAK,KAC3B,sBAAsB,KAAK;AAE/B;AAEA,SAAgB,oBAAoB,OAA4C;CAC9E,MAAM,MAAM,SAAS,KAAK,IAAI,gBAAgB,OAAO,KAAK,IAAI;CAC9D,OAAO,QAAQ,QAAQ,QAAQ,qBAAqB,GAAG;AACzD;;;;;;;;;;;;;;;AA4BA,SAAgB,eAAe,GAAyC;CACtE,IAAI,UAAU;CACd,IAAI,SAAS;CACb,SAAS;EACP,MAAM,KAAK,QAAQ,WAAW,CAAC;EAC/B,IAAI,OAAO,OAAgB,OAAO,IAAc,OAAO,KAAA;EACvD,IAAI;EACJ,IAAI;GACF,SAAS,KAAK,MAAM,OAAO;EAC7B,QAAQ;GACN;EACF;EAGA,IAAI,SAAS,MAAM,GAAG;GACpB,IAAI,OAAO,UAAU,QAAQ,QAAQ,OAAO,KAAA;GAC5C,UAAU;GACV;GACA;EACF;EACA,OAAO;GAAE,OAAO;GAAQ;EAAO;CACjC;AACF;;;;;;;;;;;;;;;;;;;;;;;AAwBA,SAAgB,sBACd,IACA,cACG;CAEH,QADiB,SAAS,EAAE,IAAI,cAAc,IAAI,YAAY,IAAI,SAAS,IAAI,YAAY,MACvE;AACtB;;;;;;;;;AAUA,SAAS,cAAc,IAAY,cAA+D;CAChG,MAAM,SAAS,eAAe,EAAE;CAChC,IAAI,WAAW,KAAA,KAAa,CAAC,qBAAqB,OAAO,KAAK,GAAG,OAAO,KAAA;CAExE,MAAM,cAAc,SAAS,OAAO,OAAO,YAAY;CACvD,IAAI,gBAAgB,KAAA,GAAW,OAAO,KAAA;CAEtC,IAAI,UAAkB,kBAAkB,WAAW;CACnD,KAAK,IAAI,QAAQ,GAAG,QAAQ,OAAO,QAAQ,SAAS,UAAU,KAAK,UAAU,OAAO;CACpF,OAAO;AACT;;AAGA,SAAS,SACP,KACA,cACgC;CAChC,IAAI,mBAAmB,GAAG,GAAG;EAC3B,MAAM,UAAU,aAAa,IAAI,OAAO;EACxC,OAAO,YAAY,IAAI,UAAU,KAAA,IAAY;GAAE,GAAG;GAAK;EAAQ;CACjE;CAGA,IAAI,kBAAkB,GAAG,GAAG,OAAO,KAAA;CAEnC,IAAI,oBAAoB,GAAG,GAAG;EAC5B,MAAM,SAAS,cAAc,IAAI,QAAQ,YAAY;EACrD,OAAO,WAAW,KAAA,IAAY,KAAA,IAAY;GAAE,GAAG;GAAa;EAA4B;CAC1F;CAEA,IAAI,sBAAsB,GAAG,GAAG;EAC9B,MAAM,SAAS,cAAc,IAAI,QAAQ,YAAY;EAErD,OAAO,WAAW,KAAA,IACd,KAAA,IACA;GAAE,GAAG;GAAa;EAAwC;CAChE;CAEA,IAAI,sBAAsB,GAAG,GAAG,OAAO,mBAAmB,KAAK,YAAY;CAE3E,MAAM,IAAI,MACR,4DAA4D,KAAK,UAAU,GAAG,GAChF;AACF;;;;;;AAOA,SAAS,mBACP,KACA,cACiC;CACjC,MAAM,SAAS,cAAc,IAAI,QAAQ,YAAY;CAErD,IAAI,cAAc;CAClB,MAAM,OAAO,IAAI,MAAM,KAAK,SAAS;EACnC,MAAM,aAAa,cAAc,KAAK,QAAQ,YAAY;EAC1D,IAAI,eAAe,KAAA,GAAW,OAAO;EACrC,cAAc;EACd,OAAO;GAAE,GAAG;GAAM,QAAQ;EAAgC;CAC5D,CAAC;CAED,IAAI,iBAAiB;CACrB,MAAM,wBACJ,IAAI,yBACH,OAAO,YACN,OAAO,QAAQ,IAAI,qBAAqB,CAAC,CAAC,KAAK,CAAC,SAAS,oBAAoB;EAC3E,MAAM,aAAa,cAAc,SAAS,YAAY;EACtD,IAAI,eAAe,KAAA,GAAW,OAAO,CAAC,SAAS,cAAc;EAC7D,iBAAiB;EACjB,OAAO,CAAC,YAAY,cAAc;CACpC,CAAC,CACH;CAEF,IAAI,WAAW,KAAA,KAAa,CAAC,eAAe,CAAC,gBAAgB,OAAO,KAAA;CACpE,OAAO;EACL,GAAG;EACH,GAAI,WAAW,KAAA,IAAY,EAAU,OAA4B,IAAI,CAAC;EACtE,GAAI,cAAc,EAAE,KAAK,IAAI,CAAC;EAC9B,GAAI,iBAAiB,EAAE,sBAAsB,IAAI,CAAC;CACpD;AACF;;;;AAKA,SAAgB,iBAAiB,IAAuD;CACtF,IAAI,SAAS,EAAE,GAAG;EAChB,IAAI,YAAY,EAAE,GAAG,OAAO;EAK5B,OAAO,iBAFL,oBAAoB,EAAE,KACtB,WAAW,yBAAyB,GAAG,qCAAqC,CAChD;CAChC;CAEA,IAAI,aAAa,EAAE,GAAG,OAAO,gBAAgB,EAAE;CAC/C,IAAI,oBAAoB,EAAE,GAAG,OAAO,iBAAiB,GAAG,MAAM;CAC9D,IAAI,sBAAsB,EAAE,GAAG,OAAO,iBAAiB,GAAG,MAAM;CAChE,IAAI,sBAAsB,EAAE,GAAG,OAAO,iBAAiB,GAAG,MAAM;CAEhE,MAAM,IAAI,MAAM,uDAAuD,KAAK,UAAU,EAAE,GAAG;AAC7F;;;;;;;;;;;;;;;AAgBA,SAAgB,sBACd,UACA,IACa;CACb,IAAI,SAAS,EAAE,GAAG;EAChB,IAAI,YAAY,EAAE,GAAG,OAAO;EAK5B,OAAO,sBAAsB,UAF3B,oBAAoB,EAAE,KACtB,WAAW,8BAA8B,GAAG,qCAAqC,CACtC;CAC/C;CAEA,IAAI,aAAa,EAAE,GAAG,OAAO;CAC7B,IAAI,sBAAsB,EAAE,GAAG,OAAO,sBAAsB,UAAU,GAAG,MAAM;CAC/E,IAAI,oBAAoB,EAAE,GACxB,OAAO,iBAAiB,sBAAsB,UAAU,GAAG,MAAM,GAAG,GAAG,WAAW;CAEpF,IAAI,sBAAsB,EAAE,GAE1B,OAAO,mBADO,sBAAsB,UAAU,GAAG,MACnB,GAAG,GAAG,aAAa;CAGnD,MAAM,IAAI,MAAM,4DAA4D,KAAK,UAAU,EAAE,GAAG;AAClG"}
@@ -46,6 +46,8 @@ exports.isColumnDiscoveredKey = require_discovered_column.isColumnDiscoveredKey;
46
46
  exports.isColumnFilteredId = require_filtered_column.isColumnFilteredId;
47
47
  exports.isColumnFilteredKey = require_filtered_column.isColumnFilteredKey;
48
48
  exports.isColumnOverriddenKey = require_overridden.isColumnOverriddenKey;
49
+ exports.isColumnUniversalId = require_ids.isColumnUniversalId;
50
+ exports.isColumnUniversalKey = require_ids.isColumnUniversalKey;
49
51
  exports.isEmptySpecDelta = require_overridden.isEmptySpecDelta;
50
52
  exports.isFilteredPColumn = require_filtered_column.isFilteredPColumn;
51
53
  exports.isLabelColumn = require_spec.isLabelColumn;
@@ -61,6 +63,7 @@ exports.parseColumnDiscoveredId = require_discovered_column.parseColumnDiscovere
61
63
  exports.parseColumnId = require_ids.parseColumnId;
62
64
  exports.parseColumnIdSafely = require_ids.parseColumnIdSafely;
63
65
  exports.parseColumnOverriddenId = require_overridden.parseColumnOverriddenId;
66
+ exports.peelJsonLayers = require_ids.peelJsonLayers;
64
67
  exports.readAnnotation = require_spec.readAnnotation;
65
68
  exports.readAnnotationJson = require_spec.readAnnotationJson;
66
69
  exports.readAnnotationJsonOrThrow = require_spec.readAnnotationJsonOrThrow;
@@ -71,6 +74,7 @@ exports.readMetadata = require_spec.readMetadata;
71
74
  exports.readMetadataJson = require_spec.readMetadataJson;
72
75
  exports.readMetadataJsonOrThrow = require_spec.readMetadataJsonOrThrow;
73
76
  exports.reconstructSpecFromId = require_ids.reconstructSpecFromId;
77
+ exports.remapColumnIdBlockIds = require_ids.remapColumnIdBlockIds;
74
78
  exports.resolveAnchors = require_anchored.resolveAnchors;
75
79
  exports.resolveAnnotationParents = require_spec.resolveAnnotationParents;
76
80
  exports.stringifyColumnDiscoveredId = require_discovered_column.stringifyColumnDiscoveredId;
@@ -1,9 +1,9 @@
1
1
  import { ColumnDiscoveredId, ColumnDiscoveredKey, createColumnDiscoveredId, createColumnDiscoveredKey, distillColumnDiscoveredKey, isColumnDiscoveredId, isColumnDiscoveredKey, parseColumnDiscoveredId, stringifyColumnDiscoveredId } from "./discovered_column.js";
2
2
  import { Annotation, AnnotationDataStatus, AnnotationJson, AxesId, AxesSpec, AxisId, AxisSpec, AxisSpecNormalized, AxisTree, AxisValueType, ColumnValueType, Domain, DomainJson, Metadata, MetadataJson, PAxisName, PColumn, PColumnIdAndSpec, PColumnName, PColumnSpec, PColumnSpecId, PDataColumnSpec, PUniversalColumnSpec, Trace, TraceEntry, ValueType, canonicalizeAxisId, canonicalizeAxisWithParents, getArrayFromAxisTree, getAxesId, getAxesTree, getAxisId, getColumnIdAndSpec, getDenormalizedAxesList, getNormalizedAxesList, getPColumnSpecId, getSetFromAxisTree, getTypeFromPColumnOrAxisSpec, isAxisId, isLabelColumn, isLinkerColumn, matchAxisId, readAnnotation, readAnnotationJson, readAnnotationJsonOrThrow, readDomain, readDomainJson, readDomainJsonOrThrow, readMetadata, readMetadataJson, readMetadataJsonOrThrow, resolveAnnotationParents } from "./spec.js";
3
3
  import { ColumnOverriddenId, ColumnOverriddenKey, SpecOverrides, applySpecOverrides, createColumnOverriddenId, createColumnOverriddenKey, deriveSpecDelta, distillColumnOverriddenKey, isColumnOverriddenKey, isEmptySpecDelta, mergeSpecOverrides, parseColumnOverriddenId, stringifyColumnOverriddenId, unwrapOverrides } from "./overridden.js";
4
- import { AxisPatches, ColumnUniversalId, ColumnUniversalKey, SUniversalPColumnId, UniversalPColumnId, extractPObjectId, parseColumnId, parseColumnIdSafely, reconstructSpecFromId, stringifyColumnId } from "./ids.js";
4
+ import { AxisPatches, ColumnUniversalId, ColumnUniversalKey, PeeledJsonLayers, SUniversalPColumnId, UniversalPColumnId, extractPObjectId, isColumnUniversalId, isColumnUniversalKey, parseColumnId, parseColumnIdSafely, peelJsonLayers, reconstructSpecFromId, remapColumnIdBlockIds, stringifyColumnId } from "./ids.js";
5
5
  import { AxisFilter, AxisFilterByIdx, AxisFilterByName, AxisFilterValue, ColumnFilteredId, ColumnFilteredKey, FilteredPColumn, FilteredPColumnId, applyAxisFilters, createColumnFilteredId, createColumnFilteredKey, isColumnFilteredId, isColumnFilteredKey, isFilteredPColumn, stringifyColumnFilteredId } from "./filtered_column.js";
6
6
  import { AnchoredIdDeriver, ResolveAnchorsOptions, resolveAnchors } from "./anchored.js";
7
7
  import { NativePObjectId, deriveNativeId } from "./native_id.js";
8
8
  import { AAxisSelector, ADomain, AnchorAxisIdOrRefBasic, AnchorAxisRef, AnchorAxisRefByIdx, AnchorAxisRefByMatcher, AnchorAxisRefByName, AnchorDomainRef, AnchoredColumnMatchStrategy, AnchoredPColumnId, AnchoredPColumnSelector, AxisQualification, LegacyAxisSelector, PColumnSelector, SingleAxisSelector, isAnchoredPColumnId, legacyColumnSelectorsToPredicate, matchAxis, matchMultiColumnSelector, matchPColumn, multiColumnSelectorsToPredicate } from "./selectors.js";
9
- export { AAxisSelector, ADomain, AnchorAxisIdOrRefBasic, AnchorAxisRef, AnchorAxisRefByIdx, AnchorAxisRefByMatcher, AnchorAxisRefByName, AnchorDomainRef, AnchoredColumnMatchStrategy, AnchoredIdDeriver, AnchoredPColumnId, AnchoredPColumnSelector, Annotation, AnnotationDataStatus, AnnotationJson, AxesId, AxesSpec, AxisFilter, AxisFilterByIdx, AxisFilterByName, AxisFilterValue, AxisId, AxisPatches, AxisQualification, AxisSpec, AxisSpecNormalized, AxisTree, AxisValueType, ColumnDiscoveredId, ColumnDiscoveredKey, ColumnFilteredId, ColumnFilteredKey, ColumnOverriddenId, ColumnOverriddenKey, ColumnUniversalId, ColumnUniversalKey, ColumnValueType, Domain, DomainJson, FilteredPColumn, FilteredPColumnId, LegacyAxisSelector, Metadata, MetadataJson, NativePObjectId, PAxisName, PColumn, PColumnIdAndSpec, PColumnName, PColumnSelector, PColumnSpec, PColumnSpecId, PDataColumnSpec, PUniversalColumnSpec, ResolveAnchorsOptions, SUniversalPColumnId, SingleAxisSelector, SpecOverrides, Trace, TraceEntry, UniversalPColumnId, ValueType, applyAxisFilters, applySpecOverrides, canonicalizeAxisId, canonicalizeAxisWithParents, createColumnDiscoveredId, createColumnDiscoveredKey, createColumnFilteredId, createColumnFilteredKey, createColumnOverriddenId, createColumnOverriddenKey, deriveNativeId, deriveSpecDelta, distillColumnDiscoveredKey, distillColumnOverriddenKey, extractPObjectId, getArrayFromAxisTree, getAxesId, getAxesTree, getAxisId, getColumnIdAndSpec, getDenormalizedAxesList, getNormalizedAxesList, getPColumnSpecId, getSetFromAxisTree, getTypeFromPColumnOrAxisSpec, isAnchoredPColumnId, isAxisId, isColumnDiscoveredId, isColumnDiscoveredKey, isColumnFilteredId, isColumnFilteredKey, isColumnOverriddenKey, isEmptySpecDelta, isFilteredPColumn, isLabelColumn, isLinkerColumn, legacyColumnSelectorsToPredicate, matchAxis, matchAxisId, matchMultiColumnSelector, matchPColumn, mergeSpecOverrides, multiColumnSelectorsToPredicate, parseColumnDiscoveredId, parseColumnId, parseColumnIdSafely, parseColumnOverriddenId, readAnnotation, readAnnotationJson, readAnnotationJsonOrThrow, readDomain, readDomainJson, readDomainJsonOrThrow, readMetadata, readMetadataJson, readMetadataJsonOrThrow, reconstructSpecFromId, resolveAnchors, resolveAnnotationParents, stringifyColumnDiscoveredId, stringifyColumnFilteredId, stringifyColumnId, stringifyColumnOverriddenId, unwrapOverrides };
9
+ export { AAxisSelector, ADomain, AnchorAxisIdOrRefBasic, AnchorAxisRef, AnchorAxisRefByIdx, AnchorAxisRefByMatcher, AnchorAxisRefByName, AnchorDomainRef, AnchoredColumnMatchStrategy, AnchoredIdDeriver, AnchoredPColumnId, AnchoredPColumnSelector, Annotation, AnnotationDataStatus, AnnotationJson, AxesId, AxesSpec, AxisFilter, AxisFilterByIdx, AxisFilterByName, AxisFilterValue, AxisId, AxisPatches, AxisQualification, AxisSpec, AxisSpecNormalized, AxisTree, AxisValueType, ColumnDiscoveredId, ColumnDiscoveredKey, ColumnFilteredId, ColumnFilteredKey, ColumnOverriddenId, ColumnOverriddenKey, ColumnUniversalId, ColumnUniversalKey, ColumnValueType, Domain, DomainJson, FilteredPColumn, FilteredPColumnId, LegacyAxisSelector, Metadata, MetadataJson, NativePObjectId, PAxisName, PColumn, PColumnIdAndSpec, PColumnName, PColumnSelector, PColumnSpec, PColumnSpecId, PDataColumnSpec, PUniversalColumnSpec, PeeledJsonLayers, ResolveAnchorsOptions, SUniversalPColumnId, SingleAxisSelector, SpecOverrides, Trace, TraceEntry, UniversalPColumnId, ValueType, applyAxisFilters, applySpecOverrides, canonicalizeAxisId, canonicalizeAxisWithParents, createColumnDiscoveredId, createColumnDiscoveredKey, createColumnFilteredId, createColumnFilteredKey, createColumnOverriddenId, createColumnOverriddenKey, deriveNativeId, deriveSpecDelta, distillColumnDiscoveredKey, distillColumnOverriddenKey, extractPObjectId, getArrayFromAxisTree, getAxesId, getAxesTree, getAxisId, getColumnIdAndSpec, getDenormalizedAxesList, getNormalizedAxesList, getPColumnSpecId, getSetFromAxisTree, getTypeFromPColumnOrAxisSpec, isAnchoredPColumnId, isAxisId, isColumnDiscoveredId, isColumnDiscoveredKey, isColumnFilteredId, isColumnFilteredKey, isColumnOverriddenKey, isColumnUniversalId, isColumnUniversalKey, isEmptySpecDelta, isFilteredPColumn, isLabelColumn, isLinkerColumn, legacyColumnSelectorsToPredicate, matchAxis, matchAxisId, matchMultiColumnSelector, matchPColumn, mergeSpecOverrides, multiColumnSelectorsToPredicate, parseColumnDiscoveredId, parseColumnId, parseColumnIdSafely, parseColumnOverriddenId, peelJsonLayers, readAnnotation, readAnnotationJson, readAnnotationJsonOrThrow, readDomain, readDomainJson, readDomainJsonOrThrow, readMetadata, readMetadataJson, readMetadataJsonOrThrow, reconstructSpecFromId, remapColumnIdBlockIds, resolveAnchors, resolveAnnotationParents, stringifyColumnDiscoveredId, stringifyColumnFilteredId, stringifyColumnId, stringifyColumnOverriddenId, unwrapOverrides };
@@ -2,8 +2,8 @@ import { Annotation, AnnotationJson, Domain, DomainJson, PAxisName, PColumnName,
2
2
  import { applyAxisFilters, createColumnFilteredId, createColumnFilteredKey, isColumnFilteredId, isColumnFilteredKey, isFilteredPColumn, stringifyColumnFilteredId } from "./filtered_column.js";
3
3
  import { createColumnDiscoveredId, createColumnDiscoveredKey, distillColumnDiscoveredKey, isColumnDiscoveredId, isColumnDiscoveredKey, parseColumnDiscoveredId, stringifyColumnDiscoveredId } from "./discovered_column.js";
4
4
  import { applySpecOverrides, createColumnOverriddenId, createColumnOverriddenKey, deriveSpecDelta, distillColumnOverriddenKey, isColumnOverriddenKey, isEmptySpecDelta, mergeSpecOverrides, parseColumnOverriddenId, stringifyColumnOverriddenId, unwrapOverrides } from "./overridden.js";
5
- import { extractPObjectId, parseColumnId, parseColumnIdSafely, reconstructSpecFromId, stringifyColumnId } from "./ids.js";
5
+ import { extractPObjectId, isColumnUniversalId, isColumnUniversalKey, parseColumnId, parseColumnIdSafely, peelJsonLayers, reconstructSpecFromId, remapColumnIdBlockIds, stringifyColumnId } from "./ids.js";
6
6
  import { AnchoredIdDeriver, resolveAnchors } from "./anchored.js";
7
7
  import { isAnchoredPColumnId, legacyColumnSelectorsToPredicate, matchAxis, matchMultiColumnSelector, matchPColumn, multiColumnSelectorsToPredicate } from "./selectors.js";
8
8
  import { deriveNativeId } from "./native_id.js";
9
- export { AnchoredIdDeriver, Annotation, AnnotationJson, Domain, DomainJson, PAxisName, PColumnName, ValueType, applyAxisFilters, applySpecOverrides, canonicalizeAxisId, canonicalizeAxisWithParents, createColumnDiscoveredId, createColumnDiscoveredKey, createColumnFilteredId, createColumnFilteredKey, createColumnOverriddenId, createColumnOverriddenKey, deriveNativeId, deriveSpecDelta, distillColumnDiscoveredKey, distillColumnOverriddenKey, extractPObjectId, getArrayFromAxisTree, getAxesId, getAxesTree, getAxisId, getColumnIdAndSpec, getDenormalizedAxesList, getNormalizedAxesList, getPColumnSpecId, getSetFromAxisTree, getTypeFromPColumnOrAxisSpec, isAnchoredPColumnId, isAxisId, isColumnDiscoveredId, isColumnDiscoveredKey, isColumnFilteredId, isColumnFilteredKey, isColumnOverriddenKey, isEmptySpecDelta, isFilteredPColumn, isLabelColumn, isLinkerColumn, legacyColumnSelectorsToPredicate, matchAxis, matchAxisId, matchMultiColumnSelector, matchPColumn, mergeSpecOverrides, multiColumnSelectorsToPredicate, parseColumnDiscoveredId, parseColumnId, parseColumnIdSafely, parseColumnOverriddenId, readAnnotation, readAnnotationJson, readAnnotationJsonOrThrow, readDomain, readDomainJson, readDomainJsonOrThrow, readMetadata, readMetadataJson, readMetadataJsonOrThrow, reconstructSpecFromId, resolveAnchors, resolveAnnotationParents, stringifyColumnDiscoveredId, stringifyColumnFilteredId, stringifyColumnId, stringifyColumnOverriddenId, unwrapOverrides };
9
+ export { AnchoredIdDeriver, Annotation, AnnotationJson, Domain, DomainJson, PAxisName, PColumnName, ValueType, applyAxisFilters, applySpecOverrides, canonicalizeAxisId, canonicalizeAxisWithParents, createColumnDiscoveredId, createColumnDiscoveredKey, createColumnFilteredId, createColumnFilteredKey, createColumnOverriddenId, createColumnOverriddenKey, deriveNativeId, deriveSpecDelta, distillColumnDiscoveredKey, distillColumnOverriddenKey, extractPObjectId, getArrayFromAxisTree, getAxesId, getAxesTree, getAxisId, getColumnIdAndSpec, getDenormalizedAxesList, getNormalizedAxesList, getPColumnSpecId, getSetFromAxisTree, getTypeFromPColumnOrAxisSpec, isAnchoredPColumnId, isAxisId, isColumnDiscoveredId, isColumnDiscoveredKey, isColumnFilteredId, isColumnFilteredKey, isColumnOverriddenKey, isColumnUniversalId, isColumnUniversalKey, isEmptySpecDelta, isFilteredPColumn, isLabelColumn, isLinkerColumn, legacyColumnSelectorsToPredicate, matchAxis, matchAxisId, matchMultiColumnSelector, matchPColumn, mergeSpecOverrides, multiColumnSelectorsToPredicate, parseColumnDiscoveredId, parseColumnId, parseColumnIdSafely, parseColumnOverriddenId, peelJsonLayers, readAnnotation, readAnnotationJson, readAnnotationJsonOrThrow, readDomain, readDomainJson, readDomainJsonOrThrow, readMetadata, readMetadataJson, readMetadataJsonOrThrow, reconstructSpecFromId, remapColumnIdBlockIds, resolveAnchors, resolveAnnotationParents, stringifyColumnDiscoveredId, stringifyColumnFilteredId, stringifyColumnId, stringifyColumnOverriddenId, unwrapOverrides };
package/dist/index.cjs CHANGED
@@ -1,6 +1,7 @@
1
1
  Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
2
2
  const require_block_config = require("./bmodel/block_config.cjs");
3
3
  const require_code = require("./bmodel/code.cjs");
4
+ const require_block_kind_ref = require("./bmodel/block_kind_ref.cjs");
4
5
  const require_normalization = require("./bmodel/normalization.cjs");
5
6
  require("./bmodel/index.cjs");
6
7
  const require_urls = require("./drivers/urls.cjs");
@@ -53,6 +54,11 @@ const require_column_selector = require("./columns/column_selector.cjs");
53
54
  const require_dedup = require("./columns/dedup.cjs");
54
55
  const require_providers = require("./columns/providers.cjs");
55
56
  require("./columns/index.cjs");
57
+ const require_kind_selector = require("./template/kind_selector.cjs");
58
+ const require_project_template_v1 = require("./template/project_template_v1.cjs");
59
+ const require_template_ref_form = require("./template/template_ref_form.cjs");
60
+ const require_template_relocate = require("./template/template_relocate.cjs");
61
+ require("./template/index.cjs");
56
62
  exports.AbortError = require_errors.AbortError;
57
63
  exports.AccessorEntriesProvider = require_providers.AccessorEntriesProvider;
58
64
  exports.AllRequiresFeatureFlags = require_block_flags.AllRequiresFeatureFlags;
@@ -77,12 +83,14 @@ exports.PColumnName = require_spec.PColumnName;
77
83
  exports.PFrameDriverError = require_errors.PFrameDriverError;
78
84
  exports.PFrameError = require_errors.PFrameError;
79
85
  exports.PFrameSpecDriverError = require_errors.PFrameSpecDriverError;
86
+ exports.PROJECT_TEMPLATE_SCHEMA_V1 = require_project_template_v1.PROJECT_TEMPLATE_SCHEMA_V1;
80
87
  exports.PTableNA = require_data_types.PTableNA;
81
88
  exports.PlId = require_plid.PlId;
82
89
  exports.PlIdBytes = require_plid.PlIdBytes;
83
90
  exports.PlIdLength = require_plid.PlIdLength;
84
91
  exports.PlRef = require_ref.PlRef;
85
92
  exports.PoolEntryGuard = require_pool_entry.PoolEntryGuard;
93
+ exports.ProjectTemplateV1ParseError = require_project_template_v1.ProjectTemplateV1ParseError;
86
94
  exports.REQUIRES_PFRAMES_VERSION = require_block_flags.REQUIRES_PFRAMES_VERSION;
87
95
  exports.RangeBytes = require_blob.RangeBytes;
88
96
  exports.ResourceTypeName = require_resource_types.ResourceTypeName;
@@ -144,6 +152,7 @@ exports.ensureError = require_errors.ensureError;
144
152
  exports.ensurePColumn = require_spec$1.ensurePColumn;
145
153
  exports.entriesToDataInfo = require_data_info.entriesToDataInfo;
146
154
  exports.executePSpecPredicate = require_query.executePSpecPredicate;
155
+ exports.expandTemplateRefs = require_template_ref_form.expandTemplateRefs;
147
156
  exports.extractAllColumns = require_spec$1.extractAllColumns;
148
157
  exports.extractAllRequirements = require_flag_utils.extractAllRequirements;
149
158
  exports.extractAllSupports = require_flag_utils.extractAllSupports;
@@ -151,6 +160,10 @@ exports.extractCodeWithInfo = require_block_config.extractCodeWithInfo;
151
160
  exports.extractConfigGeneric = require_normalization.extractConfigGeneric;
152
161
  exports.extractPObjectId = require_ids.extractPObjectId;
153
162
  exports.findDescendantsByType = require_accessor_traversal.findDescendantsByType;
163
+ exports.formatKindRef = require_block_kind_ref.formatKindRef;
164
+ exports.formatKindSelector = require_kind_selector.formatKindSelector;
165
+ exports.formatKindSelectorReference = require_kind_selector.formatKindSelectorReference;
166
+ exports.formatTemplateParseIssue = require_project_template_v1.formatTemplateParseIssue;
154
167
  exports.getArrayFromAxisTree = require_spec.getArrayFromAxisTree;
155
168
  exports.getAxesId = require_spec.getAxesId;
156
169
  exports.getAxesTree = require_spec.getAxesTree;
@@ -176,6 +189,7 @@ exports.isAggregateError = require_errors.isAggregateError;
176
189
  exports.isAnchoredPColumnId = require_selectors.isAnchoredPColumnId;
177
190
  exports.isAnyLogHandle = require_log.isAnyLogHandle;
178
191
  exports.isAxisId = require_spec.isAxisId;
192
+ exports.isBlockKindSelectorReference = require_kind_selector.isBlockKindSelectorReference;
179
193
  exports.isBlockUIURL = require_urls.isBlockUIURL;
180
194
  exports.isBooleanExpression = require_utils.isBooleanExpression;
181
195
  exports.isColumnDiscoveredId = require_discovered_column.isColumnDiscoveredId;
@@ -183,6 +197,8 @@ exports.isColumnDiscoveredKey = require_discovered_column.isColumnDiscoveredKey;
183
197
  exports.isColumnFilteredId = require_filtered_column.isColumnFilteredId;
184
198
  exports.isColumnFilteredKey = require_filtered_column.isColumnFilteredKey;
185
199
  exports.isColumnOverriddenKey = require_overridden.isColumnOverriddenKey;
200
+ exports.isColumnUniversalId = require_ids.isColumnUniversalId;
201
+ exports.isColumnUniversalKey = require_ids.isColumnUniversalKey;
186
202
  exports.isDataInfo = require_data_info.isDataInfo;
187
203
  exports.isDataInfoEntries = require_data_info.isDataInfoEntries;
188
204
  exports.isEmptySpecDelta = require_overridden.isEmptySpecDelta;
@@ -219,8 +235,10 @@ exports.isServiceInjectionError = require_errors.isServiceInjectionError;
219
235
  exports.isServiceInvalidIdError = require_errors.isServiceInvalidIdError;
220
236
  exports.isServiceMethodNotFoundError = require_errors.isServiceMethodNotFoundError;
221
237
  exports.isServiceNotRegisteredError = require_errors.isServiceNotRegisteredError;
238
+ exports.isTemplatePlRef = require_template_ref_form.isTemplatePlRef;
222
239
  exports.isValueNA = require_data_types.isValueNA;
223
240
  exports.isWasmService = require_service_types.isWasmService;
241
+ exports.kindReferenceToSelectorReference = require_kind_selector.kindReferenceToSelectorReference;
224
242
  exports.legacyColumnSelectorsToPredicate = require_selectors.legacyColumnSelectorsToPredicate;
225
243
  exports.listColumnNames = require_accessor_traversal.listColumnNames;
226
244
  exports.mapDataInfo = require_data_info.mapDataInfo;
@@ -241,6 +259,8 @@ exports.multiColumnSelectorsToPredicate = require_selectors.multiColumnSelectors
241
259
  exports.newRangeBytesOpt = require_blob.newRangeBytesOpt;
242
260
  exports.pTableValue = require_data_types.pTableValue;
243
261
  exports.pTableValueBranded = require_data_types.pTableValueBranded;
262
+ exports.parseBlockPackLocation = require_project_template_v1.parseBlockPackLocation;
263
+ exports.parseBlockPackReference = require_project_template_v1.parseBlockPackReference;
244
264
  exports.parseColumnDiscoveredId = require_discovered_column.parseColumnDiscoveredId;
245
265
  exports.parseColumnId = require_ids.parseColumnId;
246
266
  exports.parseColumnIdSafely = require_ids.parseColumnIdSafely;
@@ -248,6 +268,11 @@ exports.parseColumnOverriddenId = require_overridden.parseColumnOverriddenId;
248
268
  exports.parseHttpAuth = require_httpAuth.parseHttpAuth;
249
269
  exports.parseJson = require_json.parseJson;
250
270
  exports.parseJsonSafely = require_json.parseJsonSafely;
271
+ exports.parseKindRef = require_block_kind_ref.parseKindRef;
272
+ exports.parseKindSelector = require_kind_selector.parseKindSelector;
273
+ exports.parseKindSelectorReference = require_kind_selector.parseKindSelectorReference;
274
+ exports.parseProjectTemplateV1 = require_project_template_v1.parseProjectTemplateV1;
275
+ exports.peelJsonLayers = require_ids.peelJsonLayers;
251
276
  exports.plId = require_plid.plId;
252
277
  exports.plRefsEqual = require_ref.plRefsEqual;
253
278
  exports.readAnnotation = require_spec.readAnnotation;
@@ -259,8 +284,11 @@ exports.readDomainJsonOrThrow = require_spec.readDomainJsonOrThrow;
259
284
  exports.readMetadata = require_spec.readMetadata;
260
285
  exports.readMetadataJson = require_spec.readMetadataJson;
261
286
  exports.readMetadataJsonOrThrow = require_spec.readMetadataJsonOrThrow;
287
+ exports.readProjectTemplateV1 = require_project_template_v1.readProjectTemplateV1;
262
288
  exports.reconstructSpecFromId = require_ids.reconstructSpecFromId;
263
289
  exports.registerServiceCapabilities = require_service_capabilities.registerServiceCapabilities;
290
+ exports.relocateBlockIds = require_template_relocate.relocateBlockIds;
291
+ exports.remapColumnIdBlockIds = require_ids.remapColumnIdBlockIds;
264
292
  exports.resolveAnchors = require_anchored.resolveAnchors;
265
293
  exports.resolveAnnotationParents = require_spec.resolveAnnotationParents;
266
294
  exports.resolveNodeServiceHandler = require_service_injectors.resolveNodeServiceHandler;
@@ -273,6 +301,7 @@ exports.serviceFnKey = require_service_types.serviceFnKey;
273
301
  exports.sortJoinEntry = require_table_calculate.sortJoinEntry;
274
302
  exports.sortPTableDef = require_table_calculate.sortPTableDef;
275
303
  exports.sortSpecQuery = require_utils.sortSpecQuery;
304
+ exports.splitVersionedName = require_block_kind_ref.splitVersionedName;
276
305
  exports.stringifyColumnDiscoveredId = require_discovered_column.stringifyColumnDiscoveredId;
277
306
  exports.stringifyColumnFilteredId = require_filtered_column.stringifyColumnFilteredId;
278
307
  exports.stringifyColumnId = require_ids.stringifyColumnId;
package/dist/index.d.ts CHANGED
@@ -9,7 +9,7 @@ import { PoolEntry, PoolEntryGuard } from "./pool_entry.js";
9
9
  import { ColumnDiscoveredId, ColumnDiscoveredKey, createColumnDiscoveredId, createColumnDiscoveredKey, distillColumnDiscoveredKey, isColumnDiscoveredId, isColumnDiscoveredKey, parseColumnDiscoveredId, stringifyColumnDiscoveredId } from "./drivers/pframe/spec/discovered_column.js";
10
10
  import { Annotation, AnnotationDataStatus, AnnotationJson, AxesId, AxesSpec, AxisId, AxisSpec, AxisSpecNormalized, AxisTree, AxisValueType, ColumnValueType, Domain, DomainJson, Metadata, MetadataJson, PAxisName, PColumn, PColumnIdAndSpec, PColumnName, PColumnSpec, PColumnSpecId, PDataColumnSpec, PUniversalColumnSpec, Trace, TraceEntry, ValueType, canonicalizeAxisId, canonicalizeAxisWithParents, getArrayFromAxisTree, getAxesId, getAxesTree, getAxisId, getColumnIdAndSpec, getDenormalizedAxesList, getNormalizedAxesList, getPColumnSpecId, getSetFromAxisTree, getTypeFromPColumnOrAxisSpec, isAxisId, isLabelColumn, isLinkerColumn, matchAxisId, readAnnotation, readAnnotationJson, readAnnotationJsonOrThrow, readDomain, readDomainJson, readDomainJsonOrThrow, readMetadata, readMetadataJson, readMetadataJsonOrThrow, resolveAnnotationParents } from "./drivers/pframe/spec/spec.js";
11
11
  import { ColumnOverriddenId, ColumnOverriddenKey, SpecOverrides, applySpecOverrides, createColumnOverriddenId, createColumnOverriddenKey, deriveSpecDelta, distillColumnOverriddenKey, isColumnOverriddenKey, isEmptySpecDelta, mergeSpecOverrides, parseColumnOverriddenId, stringifyColumnOverriddenId, unwrapOverrides } from "./drivers/pframe/spec/overridden.js";
12
- import { AxisPatches, ColumnUniversalId, ColumnUniversalKey, SUniversalPColumnId, UniversalPColumnId, extractPObjectId, parseColumnId, parseColumnIdSafely, reconstructSpecFromId, stringifyColumnId } from "./drivers/pframe/spec/ids.js";
12
+ import { AxisPatches, ColumnUniversalId, ColumnUniversalKey, PeeledJsonLayers, SUniversalPColumnId, UniversalPColumnId, extractPObjectId, isColumnUniversalId, isColumnUniversalKey, parseColumnId, parseColumnIdSafely, peelJsonLayers, reconstructSpecFromId, remapColumnIdBlockIds, stringifyColumnId } from "./drivers/pframe/spec/ids.js";
13
13
  import { AxisFilter, AxisFilterByIdx, AxisFilterByName, AxisFilterValue, ColumnFilteredId, ColumnFilteredKey, FilteredPColumn, FilteredPColumnId, applyAxisFilters, createColumnFilteredId, createColumnFilteredKey, isColumnFilteredId, isColumnFilteredKey, isFilteredPColumn, stringifyColumnFilteredId } from "./drivers/pframe/spec/filtered_column.js";
14
14
  import { AnchoredIdDeriver, ResolveAnchorsOptions, resolveAnchors } from "./drivers/pframe/spec/anchored.js";
15
15
  import { NativePObjectId, deriveNativeId } from "./drivers/pframe/spec/native_id.js";
@@ -58,6 +58,7 @@ import { AllRequiresFeatureFlags, AllSupportsFeatureFlags, BlockCodeFeatureFlags
58
58
  import { BlockCodeWithInfo, Code } from "./bmodel/code.js";
59
59
  import { BlockRenderingMode } from "./bmodel/types.js";
60
60
  import { BlockConfigGeneric, BlockConfigV3Generic, BlockConfigV4Generic, extractCodeWithInfo } from "./bmodel/block_config.js";
61
+ import { BlockKindReference, formatKindRef, parseKindRef, splitVersionedName } from "./bmodel/block_kind_ref.js";
61
62
  import { BlockConfigContainer } from "./bmodel/container.js";
62
63
  import { extractConfigGeneric } from "./bmodel/normalization.js";
63
64
  import { AbortError, PFrameDriverError, PFrameError, PFrameSpecDriverError, ResultOrError, SerializedError, ServiceAlreadyRegisteredError, ServiceError, ServiceInjectionError, ServiceInvalidIdError, ServiceMethodNotFoundError, ServiceNotRegisteredError, UiError, deserializeError, deserializeResult, ensureError, hasAbortError, isAbortError, isAggregateError, isPFrameDriverError, isPFrameError, isPFrameSpecDriverError, isServiceAlreadyRegisteredError, isServiceError, isServiceInjectionError, isServiceInvalidIdError, isServiceMethodNotFoundError, isServiceNotRegisteredError, serializeError, serializeResult, unwrapResult, wrapAndSerialize, wrapAndSerializeAsync, wrapAsyncCallback, wrapCallback } from "./errors.js";
@@ -73,4 +74,8 @@ import { COLLECT_TYPES, DESCEND_TYPES, findDescendantsByType, indexAccessorRoot,
73
74
  import { ColumnRegistry } from "./columns/column_registry.js";
74
75
  import { dedupColumns } from "./columns/dedup.js";
75
76
  import { AccessorEntriesProvider, ResultPoolEntriesProvider } from "./columns/providers.js";
76
- export { AAxisSelector, ADomain, AbortError, AccessorEntriesProvider, AccessorHandle, AccessorLike, AllRequiresFeatureFlags, AllSupportsFeatureFlags, AnchorAxisIdOrRefBasic, AnchorAxisRef, AnchorAxisRefByIdx, AnchorAxisRefByMatcher, AnchorAxisRefByName, AnchorDomainRef, AnchorEntry, AnchoredColumnMatchStrategy, AnchoredIdDeriver, AnchoredPColumnId, AnchoredPColumnSelector, Annotation, AnnotationDataStatus, AnnotationJson, AnyFunction, AnyLogHandle, ArchiveFormat, ArrayTypeUnion, ArtificialColumnJoinEntry, Assert, AssertKeysEqual, AuthorMarker, AxesId, AxesSpec, AxisFilter, AxisFilterByIdx, AxisFilterByName, AxisFilterValue, AxisId, AxisPatches, AxisQualification, AxisSpec, AxisSpecNormalized, AxisTree, AxisValueType, Base64Compatible, Base64Encoded, BasicHttpAuth, BinaryChunk, BinaryPartitionedDataInfo, BinaryPartitionedDataInfoEntries, BlobDriver, BlobDriverMetrics, BlobHandleAndSize, BlobLike, BlobToURLDriver, BlockCodeFeatureFlags, BlockCodeKnownFeatureFlags, BlockCodeWithInfo, BlockConfigContainer, BlockConfigGeneric, BlockConfigV3Generic, BlockConfigV4Generic, BlockOutputsBase, BlockRenderingMode, BlockSection, BlockSectionDelimiter, BlockSectionLink, BlockSectionLinkAppearance, BlockState, BlockStateV3, BlockUIURL, Branded, BuildQueryInput, COLLECT_TYPES, CalculateTableDataRequest, CalculateTableDataResponse, CanonicalizedJson, ChunkedStreamReader, ChunkedStreamReaderOptions, Code, CollectionHandle, ColumnAxesWithQualifications, ColumnDiscoveredId, ColumnDiscoveredKey, ColumnEntriesProvider, ColumnFilter, ColumnFilteredId, ColumnFilteredKey, ColumnJoinEntry, ColumnOverriddenId, ColumnOverriddenKey, ColumnRegistry, ColumnSelector, ColumnUniversalId, ColumnUniversalKey, ColumnValueType, ColumnsCollectionDriver, ColumnsCollectionDriverHost, ColumnsCollectionDriverModel, ColumnsDiscoverOptions, ColumnsFilterOptions, CompositeLinkerMap, ConstantAxisFilter, ContentHandler, CreateEnrichmentRefOptions, DESCEND_TYPES, DataExprAxisRef, DataExprColumnRef, DataInfo, DataInfoEntries, DataQuery, DataQueryBooleanExpression, DataQueryColumn, DataQueryExpression, DataQueryFilter, DataQueryInlineColumn, DataQueryJoinEntry, DataQueryLinkerJoin, DataQueryLinkerJoinLinker, DataQueryOuterJoin, DataQuerySliceAxes, DataQuerySort, DataQuerySparseToDenseColumn, DataQuerySymmetricJoin, DataQueryTransformColumns, DatasetInput, DefaultNavigationState, DeleteColumnRequest, DeleteColumnResponse, DialogService, DiscoverColumnsConstraints, DiscoverColumnsFilterStep, DiscoverColumnsLinkerStep, DiscoverColumnsMappingVariant, DiscoverColumnsOptions, DiscoverColumnsRequest, DiscoverColumnsResponse, DiscoverColumnsResponseHit, DiscoverColumnsResponseQualifications, DiscoverColumnsStepInfo, Domain, DomainJson, DriverKit, EnrichmentLinkerStep, EnrichmentRef, EnrichmentStep, ErrorHandlerStatus, EvaluateQueryResponse, ExportPTableOptions, FieldTraversalStepLike, FileFilter, FileLike, FileRange, FilterKeysByPrefix, FilterSpec, FilterSpecLeaf, FilterSpecNode, FilterSpecOfType, FilterSpecType, FilteredPColumn, FilteredPColumnId, FindColumnsRequest, FindColumnsResponse, FolderURL, FrontendDriver, FullJoin, FullPTableColumnData, GetContentOptions, GlobalPObjectId, GlobalPObjectKey, HttpAuth, ImportFileHandle, ImportFileHandleIndex, ImportFileHandleUpload, ImportProgress, ImportStatus, IncompatibleFlagsError, InferFilterSpecCommonLeaf, InferFilterSpecCommonNode, InferFilterSpecLeaf, InferFilterSpecLeafColumn, InferServiceKind, InferServiceModel, InferServiceModelHost, InferServiceUi, InferServiceUiHost, InlineColumnJoinEntry, InnerJoin, Is, IsSubtypeOf, JoinEntry, JsonCompatible, JsonDataInfo, JsonDataInfoEntries, JsonPartitionedDataInfo, JsonPartitionedDataInfoEntries, JsonSerializable, KnownServiceName, LabeledEnrichmentRef, LabeledEnrichmentRefs, LeafEntry, LegacyAxisSelector, LinkerMap, ListFilesResult, ListOptionBase, LiveLogHandle, LocalBlobHandle, LocalBlobHandleAndSize, LocalImportFileHandle, LocalPObjectId, LocalPObjectKey, LogsDriver, LsDriver, LsEntry, MODEL_SERVICE_METHOD_MAP, MatchQualifications, MatcherMap, MatchingMode, Metadata, MetadataJson, ModelServiceFactoryMap, ModelServiceRegistry, ModelServices, MultiAxisSelector, MultiColumnSelector, NativePObjectId, NavigationState, NodeServiceHandlerMap, OpenDialogFilter, OpenDialogOps, OpenMultipleFilesResponse, OpenSingleFileResponse, Option, OuterJoin, OutputWithStatus, PAxisName, PColumn, PColumnDataEntry, PColumnIdAndSpec, PColumnKey, PColumnName, PColumnSelector, PColumnSpec, PColumnSpecId, PColumnValue, PColumnValues, PColumnValuesEntry, PDataColumnSpec, PFrame, PFrameDef, PFrameDriver, PFrameDriverError, PFrameError, PFrameHandle, PFrameModelDriver, PFrameSpecDriver, PFrameSpecDriverError, PObject, PObjectId, PObjectSpec, PSpecPredicate, PTable, PTableColumnId, PTableColumnIdAxis, PTableColumnIdColumn, PTableColumnSpec, PTableColumnSpecAxis, PTableColumnSpecColumn, PTableDef, PTableDefV2, PTableDownloadCompression, PTableDownloadFormat, PTableHandle, PTableNA, PTableRecordFilter, PTableRecordSingleValueFilterV2, PTableShape, PTableSorting, PTableValue, PTableValueAxis, PTableValueBranded, PTableValueData, PTableValueDataBranded, PTableValueDouble, PTableValueFloat, PTableValueInt, PTableValueLong, PTableValueString, PTableVector, PTableVectorTyped, PUniversalColumnSpec, PVectorData, PVectorDataBytes, PVectorDataDouble, PVectorDataFloat, PVectorDataInt, PVectorDataLong, PVectorDataString, PVectorDataTyped, ParquetChunk, ParquetChunkMapping, ParquetChunkMappingAxis, ParquetChunkMappingColumn, ParquetChunkMetadata, ParquetChunkStats, ParquetPartitionedDataInfo, ParquetPartitionedDataInfoEntries, PartitionedDataInfoEntries, PlId, PlIdBytes, PlIdLength, PlRef, PoolEntry, PoolEntryGuard, PrimaryRef, ProgressLogWithInfo, ProjectId, REQUIRES_PFRAMES_VERSION, RangeBytes, ReadyLogHandle, Ref, RelaxedAxisSelector, RelaxedColumnSelector, RelaxedRecord, RelaxedStringMatchers, RemoteBlobHandle, RemoteBlobHandleAndSize, RequireServices, ResolveAnchorsOptions, ResourceTypeName, ResourceTypePrefix, ResultCollection, ResultOrError, ResultPoolEntriesProvider, ResultPoolEntry, RootFilterSpec, RuntimeCapabilities, SERVICE_CAPABILITY_FLAGS, SERVICE_FEATURE_FLAGS, SERVICE_METHOD_MAP, SUniversalPColumnId, SerializedColumnsSource, SerializedError, ServiceAlreadyRegisteredError, ServiceBrand, ServiceDispatch, ServiceError, ServiceInjectionError, ServiceInvalidIdError, ServiceMethodNotFoundError, ServiceName, ServiceNameLiterals, ServiceNotRegisteredError, ServiceRequireFlags, ServiceType, ServiceTypesLike, Services, ShowSaveDialogOptions, ShowSaveDialogResult, SingleAxisSelector, SingleValueAndPredicateV2, SingleValueEqualPredicate, SingleValueGreaterOrEqualPredicate, SingleValueGreaterPredicate, SingleValueIEqualPredicate, SingleValueInSetPredicate, SingleValueIsNAPredicate, SingleValueLessOrEqualPredicate, SingleValueLessPredicate, SingleValueMatchesPredicate, SingleValueNotPredicateV2, SingleValueOrPredicateV2, SingleValuePredicateV2, SingleValueStringContainsFuzzyPredicate, SingleValueStringContainsPredicate, SingleValueStringIContainsFuzzyPredicate, SingleValueStringIContainsPredicate, SlicedColumnJoinEntry, SpecExprAxisRef, SpecExprColumnRef, SpecFrameHandle, SpecOverrides, SpecQuery, SpecQueryBooleanExpression, SpecQueryColumn, SpecQueryExpression, SpecQueryFilter, SpecQueryInlineColumn, SpecQueryJoinEntry, SpecQueryLinkerJoin, SpecQueryOuterJoin, SpecQuerySliceAxes, SpecQuerySort, SpecQuerySparseToDenseColumn, SpecQuerySpecOverride, SpecQuerySymmetricJoin, SpecQueryTransformColumns, StorageEntry, StorageHandle, StorageHandleLocal, StorageHandleRemote, StreamingApiResponse, StreamingApiResponseHandleOutdated, StreamingApiResponseOk, StringMatcher, StringifiedJson, SupportedRequirement, TableRange, Trace, TraceEntry, UiError, UiServiceFactoryMap, UiServiceRegistry, UiServices, UniqueValuesRequest, UniqueValuesResponse, UniversalPColumnId, UpstreamBlockCtx, ValueOrError, ValueType, ValueTypeSupported, ValueWithUTag, ValueWithUTagAndAuthor, WritePTableToFsOptions, WritePTableToFsResult, XLSX_MAX_ROWS_PER_SHEET, applyAxisFilters, applySpecOverrides, assertNever, base64Decode, base64Encode, bigintReplacer, buildServiceInfo, canonicalizeAxisId, canonicalizeAxisWithParents, canonicalizeJson, checkBlockFlag, collectSpecQueryColumns, convertColumnSelectorToMultiColumnSelector, convertRelaxedAxisSelectorToMultiAxisSelector, convertRelaxedColumnSelectorToMultiColumnSelector, createColumnDiscoveredId, createColumnDiscoveredKey, createColumnFilteredId, createColumnFilteredKey, createColumnOverriddenId, createColumnOverriddenKey, createEnrichmentRef, createGlobalPObjectId, createLocalPObjectId, createNodeServiceHandlers, createPObjectId, createPlRef, createPrimaryRef, dataInfoToEntries, dedupColumns, deriveNativeId, deriveSpecDelta, deserializeError, deserializeResult, digestPlId, distillColumnDiscoveredKey, distillColumnOverriddenKey, ensureError, ensurePColumn, entriesToDataInfo, executePSpecPredicate, extractAllColumns, extractAllRequirements, extractAllSupports, extractCodeWithInfo, extractConfigGeneric, extractPObjectId, findDescendantsByType, getArrayFromAxisTree, getAxesId, getAxesTree, getAxisId, getColumnIdAndSpec, getDenormalizedAxesList, getFileNameFromHandle, getFilePathFromHandle, getMethodNames, getNormalizedAxesList, getPColumnSpecId, getPTableColumnId, getServiceKind, getServiceModelMethods, getServiceUiMethods, getSetFromAxisTree, getTypeFromPColumnOrAxisSpec, hasAbortError, indexAccessorRoot, indexPoolBlock, isAbortError, isAggregateError, isAnchoredPColumnId, isAnyLogHandle, isAxisId, isBlockUIURL, isBooleanExpression, isColumnDiscoveredId, isColumnDiscoveredKey, isColumnFilteredId, isColumnFilteredKey, isColumnOverriddenKey, isDataInfo, isDataInfoEntries, isEmptySpecDelta, isEnrichmentRef, isFilteredPColumn, isFolderURL, isGlobalPObjectId, isGlobalPObjectKey, isImportFileHandleIndex, isImportFileHandleUpload, isKnownServiceName, isLabelColumn, isLinkerColumn, isLiveLog, isLocalPObjectId, isLocalPObjectKey, isMainService, isNodeService, isPColumn, isPColumnSpec, isPFrameDriverError, isPFrameError, isPFrameSpecDriverError, isPObject, isPObjectId, isPObjectKey, isPTableNA, isPartitionedDataInfoEntries, isPlRef, isPrimaryRef, isServiceAlreadyRegisteredError, isServiceError, isServiceInjectionError, isServiceInvalidIdError, isServiceMethodNotFoundError, isServiceNotRegisteredError, isValueNA, isWasmService, legacyColumnSelectorsToPredicate, listColumnNames, mapDataInfo, mapDataInfoEntries, mapJoinEntry, mapPObjectData, mapPTableDef, mapPTableDefV2, mapSpecQueryColumns, mapValueInVOE, matchAxis, matchAxisId, matchMultiColumnSelector, matchPColumn, matchingModeToConstraints, mergeSpecOverrides, multiColumnSelectorsToPredicate, newRangeBytesOpt, pTableValue, pTableValueBranded, parseColumnDiscoveredId, parseColumnId, parseColumnIdSafely, parseColumnOverriddenId, parseHttpAuth, parseJson, parseJsonSafely, plId, plRefsEqual, readAnnotation, readAnnotationJson, readAnnotationJsonOrThrow, readDomain, readDomainJson, readDomainJsonOrThrow, readMetadata, readMetadataJson, readMetadataJsonOrThrow, reconstructSpecFromId, registerServiceCapabilities, resolveAnchors, resolveAnnotationParents, resolveNodeServiceHandler, resolveRequiredServices, serializeError, serializeHttpAuth, serializeResult, service, serviceFnKey, sortJoinEntry, sortPTableDef, sortSpecQuery, stringifyColumnDiscoveredId, stringifyColumnFilteredId, stringifyColumnId, stringifyColumnOverriddenId, stringifyJson, traverseQuerySpec, uniqueBy, uniquePlId, unwrapOverrides, unwrapResult, validateRangeBytes, visitDataInfo, withEnrichments, wrapAndSerialize, wrapAndSerializeAsync, wrapAsyncCallback, wrapCallback };
77
+ import { BlockKindSelectorReference, KindSelector, KindSelectorOp, formatKindSelector, formatKindSelectorReference, isBlockKindSelectorReference, kindReferenceToSelectorReference, parseKindSelector, parseKindSelectorReference } from "./template/kind_selector.js";
78
+ import { BlockPackLocationReference, BlockPackLocatorOverride, BlockPackReference, PROJECT_TEMPLATE_SCHEMA_V1, ProjectTemplateSchemaV1, ProjectTemplateV1, ProjectTemplateV1Entry, ProjectTemplateV1ParseError, ProjectTemplateV1ReadResult, TemplateParseIssue, formatTemplateParseIssue, parseBlockPackLocation, parseBlockPackReference, parseProjectTemplateV1, readProjectTemplateV1 } from "./template/project_template_v1.js";
79
+ import { TemplatePlRef, expandTemplateRefs, isTemplatePlRef } from "./template/template_ref_form.js";
80
+ import { relocateBlockIds } from "./template/template_relocate.js";
81
+ export { AAxisSelector, ADomain, AbortError, AccessorEntriesProvider, AccessorHandle, AccessorLike, AllRequiresFeatureFlags, AllSupportsFeatureFlags, AnchorAxisIdOrRefBasic, AnchorAxisRef, AnchorAxisRefByIdx, AnchorAxisRefByMatcher, AnchorAxisRefByName, AnchorDomainRef, AnchorEntry, AnchoredColumnMatchStrategy, AnchoredIdDeriver, AnchoredPColumnId, AnchoredPColumnSelector, Annotation, AnnotationDataStatus, AnnotationJson, AnyFunction, AnyLogHandle, ArchiveFormat, ArrayTypeUnion, ArtificialColumnJoinEntry, Assert, AssertKeysEqual, AuthorMarker, AxesId, AxesSpec, AxisFilter, AxisFilterByIdx, AxisFilterByName, AxisFilterValue, AxisId, AxisPatches, AxisQualification, AxisSpec, AxisSpecNormalized, AxisTree, AxisValueType, Base64Compatible, Base64Encoded, BasicHttpAuth, BinaryChunk, BinaryPartitionedDataInfo, BinaryPartitionedDataInfoEntries, BlobDriver, BlobDriverMetrics, BlobHandleAndSize, BlobLike, BlobToURLDriver, BlockCodeFeatureFlags, BlockCodeKnownFeatureFlags, BlockCodeWithInfo, BlockConfigContainer, BlockConfigGeneric, BlockConfigV3Generic, BlockConfigV4Generic, BlockKindReference, BlockKindSelectorReference, BlockOutputsBase, BlockPackLocationReference, BlockPackLocatorOverride, BlockPackReference, BlockRenderingMode, BlockSection, BlockSectionDelimiter, BlockSectionLink, BlockSectionLinkAppearance, BlockState, BlockStateV3, BlockUIURL, Branded, BuildQueryInput, COLLECT_TYPES, CalculateTableDataRequest, CalculateTableDataResponse, CanonicalizedJson, ChunkedStreamReader, ChunkedStreamReaderOptions, Code, CollectionHandle, ColumnAxesWithQualifications, ColumnDiscoveredId, ColumnDiscoveredKey, ColumnEntriesProvider, ColumnFilter, ColumnFilteredId, ColumnFilteredKey, ColumnJoinEntry, ColumnOverriddenId, ColumnOverriddenKey, ColumnRegistry, ColumnSelector, ColumnUniversalId, ColumnUniversalKey, ColumnValueType, ColumnsCollectionDriver, ColumnsCollectionDriverHost, ColumnsCollectionDriverModel, ColumnsDiscoverOptions, ColumnsFilterOptions, CompositeLinkerMap, ConstantAxisFilter, ContentHandler, CreateEnrichmentRefOptions, DESCEND_TYPES, DataExprAxisRef, DataExprColumnRef, DataInfo, DataInfoEntries, DataQuery, DataQueryBooleanExpression, DataQueryColumn, DataQueryExpression, DataQueryFilter, DataQueryInlineColumn, DataQueryJoinEntry, DataQueryLinkerJoin, DataQueryLinkerJoinLinker, DataQueryOuterJoin, DataQuerySliceAxes, DataQuerySort, DataQuerySparseToDenseColumn, DataQuerySymmetricJoin, DataQueryTransformColumns, DatasetInput, DefaultNavigationState, DeleteColumnRequest, DeleteColumnResponse, DialogService, DiscoverColumnsConstraints, DiscoverColumnsFilterStep, DiscoverColumnsLinkerStep, DiscoverColumnsMappingVariant, DiscoverColumnsOptions, DiscoverColumnsRequest, DiscoverColumnsResponse, DiscoverColumnsResponseHit, DiscoverColumnsResponseQualifications, DiscoverColumnsStepInfo, Domain, DomainJson, DriverKit, EnrichmentLinkerStep, EnrichmentRef, EnrichmentStep, ErrorHandlerStatus, EvaluateQueryResponse, ExportPTableOptions, FieldTraversalStepLike, FileFilter, FileLike, FileRange, FilterKeysByPrefix, FilterSpec, FilterSpecLeaf, FilterSpecNode, FilterSpecOfType, FilterSpecType, FilteredPColumn, FilteredPColumnId, FindColumnsRequest, FindColumnsResponse, FolderURL, FrontendDriver, FullJoin, FullPTableColumnData, GetContentOptions, GlobalPObjectId, GlobalPObjectKey, HttpAuth, ImportFileHandle, ImportFileHandleIndex, ImportFileHandleUpload, ImportProgress, ImportStatus, IncompatibleFlagsError, InferFilterSpecCommonLeaf, InferFilterSpecCommonNode, InferFilterSpecLeaf, InferFilterSpecLeafColumn, InferServiceKind, InferServiceModel, InferServiceModelHost, InferServiceUi, InferServiceUiHost, InlineColumnJoinEntry, InnerJoin, Is, IsSubtypeOf, JoinEntry, JsonCompatible, JsonDataInfo, JsonDataInfoEntries, JsonPartitionedDataInfo, JsonPartitionedDataInfoEntries, JsonSerializable, KindSelector, KindSelectorOp, KnownServiceName, LabeledEnrichmentRef, LabeledEnrichmentRefs, LeafEntry, LegacyAxisSelector, LinkerMap, ListFilesResult, ListOptionBase, LiveLogHandle, LocalBlobHandle, LocalBlobHandleAndSize, LocalImportFileHandle, LocalPObjectId, LocalPObjectKey, LogsDriver, LsDriver, LsEntry, MODEL_SERVICE_METHOD_MAP, MatchQualifications, MatcherMap, MatchingMode, Metadata, MetadataJson, ModelServiceFactoryMap, ModelServiceRegistry, ModelServices, MultiAxisSelector, MultiColumnSelector, NativePObjectId, NavigationState, NodeServiceHandlerMap, OpenDialogFilter, OpenDialogOps, OpenMultipleFilesResponse, OpenSingleFileResponse, Option, OuterJoin, OutputWithStatus, PAxisName, PColumn, PColumnDataEntry, PColumnIdAndSpec, PColumnKey, PColumnName, PColumnSelector, PColumnSpec, PColumnSpecId, PColumnValue, PColumnValues, PColumnValuesEntry, PDataColumnSpec, PFrame, PFrameDef, PFrameDriver, PFrameDriverError, PFrameError, PFrameHandle, PFrameModelDriver, PFrameSpecDriver, PFrameSpecDriverError, PObject, PObjectId, PObjectSpec, PROJECT_TEMPLATE_SCHEMA_V1, PSpecPredicate, PTable, PTableColumnId, PTableColumnIdAxis, PTableColumnIdColumn, PTableColumnSpec, PTableColumnSpecAxis, PTableColumnSpecColumn, PTableDef, PTableDefV2, PTableDownloadCompression, PTableDownloadFormat, PTableHandle, PTableNA, PTableRecordFilter, PTableRecordSingleValueFilterV2, PTableShape, PTableSorting, PTableValue, PTableValueAxis, PTableValueBranded, PTableValueData, PTableValueDataBranded, PTableValueDouble, PTableValueFloat, PTableValueInt, PTableValueLong, PTableValueString, PTableVector, PTableVectorTyped, PUniversalColumnSpec, PVectorData, PVectorDataBytes, PVectorDataDouble, PVectorDataFloat, PVectorDataInt, PVectorDataLong, PVectorDataString, PVectorDataTyped, ParquetChunk, ParquetChunkMapping, ParquetChunkMappingAxis, ParquetChunkMappingColumn, ParquetChunkMetadata, ParquetChunkStats, ParquetPartitionedDataInfo, ParquetPartitionedDataInfoEntries, PartitionedDataInfoEntries, PeeledJsonLayers, PlId, PlIdBytes, PlIdLength, PlRef, PoolEntry, PoolEntryGuard, PrimaryRef, ProgressLogWithInfo, ProjectId, ProjectTemplateSchemaV1, ProjectTemplateV1, ProjectTemplateV1Entry, ProjectTemplateV1ParseError, ProjectTemplateV1ReadResult, REQUIRES_PFRAMES_VERSION, RangeBytes, ReadyLogHandle, Ref, RelaxedAxisSelector, RelaxedColumnSelector, RelaxedRecord, RelaxedStringMatchers, RemoteBlobHandle, RemoteBlobHandleAndSize, RequireServices, ResolveAnchorsOptions, ResourceTypeName, ResourceTypePrefix, ResultCollection, ResultOrError, ResultPoolEntriesProvider, ResultPoolEntry, RootFilterSpec, RuntimeCapabilities, SERVICE_CAPABILITY_FLAGS, SERVICE_FEATURE_FLAGS, SERVICE_METHOD_MAP, SUniversalPColumnId, SerializedColumnsSource, SerializedError, ServiceAlreadyRegisteredError, ServiceBrand, ServiceDispatch, ServiceError, ServiceInjectionError, ServiceInvalidIdError, ServiceMethodNotFoundError, ServiceName, ServiceNameLiterals, ServiceNotRegisteredError, ServiceRequireFlags, ServiceType, ServiceTypesLike, Services, ShowSaveDialogOptions, ShowSaveDialogResult, SingleAxisSelector, SingleValueAndPredicateV2, SingleValueEqualPredicate, SingleValueGreaterOrEqualPredicate, SingleValueGreaterPredicate, SingleValueIEqualPredicate, SingleValueInSetPredicate, SingleValueIsNAPredicate, SingleValueLessOrEqualPredicate, SingleValueLessPredicate, SingleValueMatchesPredicate, SingleValueNotPredicateV2, SingleValueOrPredicateV2, SingleValuePredicateV2, SingleValueStringContainsFuzzyPredicate, SingleValueStringContainsPredicate, SingleValueStringIContainsFuzzyPredicate, SingleValueStringIContainsPredicate, SlicedColumnJoinEntry, SpecExprAxisRef, SpecExprColumnRef, SpecFrameHandle, SpecOverrides, SpecQuery, SpecQueryBooleanExpression, SpecQueryColumn, SpecQueryExpression, SpecQueryFilter, SpecQueryInlineColumn, SpecQueryJoinEntry, SpecQueryLinkerJoin, SpecQueryOuterJoin, SpecQuerySliceAxes, SpecQuerySort, SpecQuerySparseToDenseColumn, SpecQuerySpecOverride, SpecQuerySymmetricJoin, SpecQueryTransformColumns, StorageEntry, StorageHandle, StorageHandleLocal, StorageHandleRemote, StreamingApiResponse, StreamingApiResponseHandleOutdated, StreamingApiResponseOk, StringMatcher, StringifiedJson, SupportedRequirement, TableRange, TemplateParseIssue, TemplatePlRef, Trace, TraceEntry, UiError, UiServiceFactoryMap, UiServiceRegistry, UiServices, UniqueValuesRequest, UniqueValuesResponse, UniversalPColumnId, UpstreamBlockCtx, ValueOrError, ValueType, ValueTypeSupported, ValueWithUTag, ValueWithUTagAndAuthor, WritePTableToFsOptions, WritePTableToFsResult, XLSX_MAX_ROWS_PER_SHEET, applyAxisFilters, applySpecOverrides, assertNever, base64Decode, base64Encode, bigintReplacer, buildServiceInfo, canonicalizeAxisId, canonicalizeAxisWithParents, canonicalizeJson, checkBlockFlag, collectSpecQueryColumns, convertColumnSelectorToMultiColumnSelector, convertRelaxedAxisSelectorToMultiAxisSelector, convertRelaxedColumnSelectorToMultiColumnSelector, createColumnDiscoveredId, createColumnDiscoveredKey, createColumnFilteredId, createColumnFilteredKey, createColumnOverriddenId, createColumnOverriddenKey, createEnrichmentRef, createGlobalPObjectId, createLocalPObjectId, createNodeServiceHandlers, createPObjectId, createPlRef, createPrimaryRef, dataInfoToEntries, dedupColumns, deriveNativeId, deriveSpecDelta, deserializeError, deserializeResult, digestPlId, distillColumnDiscoveredKey, distillColumnOverriddenKey, ensureError, ensurePColumn, entriesToDataInfo, executePSpecPredicate, expandTemplateRefs, extractAllColumns, extractAllRequirements, extractAllSupports, extractCodeWithInfo, extractConfigGeneric, extractPObjectId, findDescendantsByType, formatKindRef, formatKindSelector, formatKindSelectorReference, formatTemplateParseIssue, getArrayFromAxisTree, getAxesId, getAxesTree, getAxisId, getColumnIdAndSpec, getDenormalizedAxesList, getFileNameFromHandle, getFilePathFromHandle, getMethodNames, getNormalizedAxesList, getPColumnSpecId, getPTableColumnId, getServiceKind, getServiceModelMethods, getServiceUiMethods, getSetFromAxisTree, getTypeFromPColumnOrAxisSpec, hasAbortError, indexAccessorRoot, indexPoolBlock, isAbortError, isAggregateError, isAnchoredPColumnId, isAnyLogHandle, isAxisId, isBlockKindSelectorReference, isBlockUIURL, isBooleanExpression, isColumnDiscoveredId, isColumnDiscoveredKey, isColumnFilteredId, isColumnFilteredKey, isColumnOverriddenKey, isColumnUniversalId, isColumnUniversalKey, isDataInfo, isDataInfoEntries, isEmptySpecDelta, isEnrichmentRef, isFilteredPColumn, isFolderURL, isGlobalPObjectId, isGlobalPObjectKey, isImportFileHandleIndex, isImportFileHandleUpload, isKnownServiceName, isLabelColumn, isLinkerColumn, isLiveLog, isLocalPObjectId, isLocalPObjectKey, isMainService, isNodeService, isPColumn, isPColumnSpec, isPFrameDriverError, isPFrameError, isPFrameSpecDriverError, isPObject, isPObjectId, isPObjectKey, isPTableNA, isPartitionedDataInfoEntries, isPlRef, isPrimaryRef, isServiceAlreadyRegisteredError, isServiceError, isServiceInjectionError, isServiceInvalidIdError, isServiceMethodNotFoundError, isServiceNotRegisteredError, isTemplatePlRef, isValueNA, isWasmService, kindReferenceToSelectorReference, legacyColumnSelectorsToPredicate, listColumnNames, mapDataInfo, mapDataInfoEntries, mapJoinEntry, mapPObjectData, mapPTableDef, mapPTableDefV2, mapSpecQueryColumns, mapValueInVOE, matchAxis, matchAxisId, matchMultiColumnSelector, matchPColumn, matchingModeToConstraints, mergeSpecOverrides, multiColumnSelectorsToPredicate, newRangeBytesOpt, pTableValue, pTableValueBranded, parseBlockPackLocation, parseBlockPackReference, parseColumnDiscoveredId, parseColumnId, parseColumnIdSafely, parseColumnOverriddenId, parseHttpAuth, parseJson, parseJsonSafely, parseKindRef, parseKindSelector, parseKindSelectorReference, parseProjectTemplateV1, peelJsonLayers, plId, plRefsEqual, readAnnotation, readAnnotationJson, readAnnotationJsonOrThrow, readDomain, readDomainJson, readDomainJsonOrThrow, readMetadata, readMetadataJson, readMetadataJsonOrThrow, readProjectTemplateV1, reconstructSpecFromId, registerServiceCapabilities, relocateBlockIds, remapColumnIdBlockIds, resolveAnchors, resolveAnnotationParents, resolveNodeServiceHandler, resolveRequiredServices, serializeError, serializeHttpAuth, serializeResult, service, serviceFnKey, sortJoinEntry, sortPTableDef, sortSpecQuery, splitVersionedName, stringifyColumnDiscoveredId, stringifyColumnFilteredId, stringifyColumnId, stringifyColumnOverriddenId, stringifyJson, traverseQuerySpec, uniqueBy, uniquePlId, unwrapOverrides, unwrapResult, validateRangeBytes, visitDataInfo, withEnrichments, wrapAndSerialize, wrapAndSerializeAsync, wrapAsyncCallback, wrapCallback };
package/dist/index.js CHANGED
@@ -1,5 +1,6 @@
1
1
  import { extractCodeWithInfo } from "./bmodel/block_config.js";
2
2
  import { Code } from "./bmodel/code.js";
3
+ import { formatKindRef, parseKindRef, splitVersionedName } from "./bmodel/block_kind_ref.js";
3
4
  import { extractConfigGeneric } from "./bmodel/normalization.js";
4
5
  import "./bmodel/index.js";
5
6
  import { isBlockUIURL, isFolderURL } from "./drivers/urls.js";
@@ -21,7 +22,7 @@ import { executePSpecPredicate } from "./pool/query.js";
21
22
  import "./pool/index.js";
22
23
  import { createColumnDiscoveredId, createColumnDiscoveredKey, distillColumnDiscoveredKey, isColumnDiscoveredId, isColumnDiscoveredKey, parseColumnDiscoveredId, stringifyColumnDiscoveredId } from "./drivers/pframe/spec/discovered_column.js";
23
24
  import { applySpecOverrides, createColumnOverriddenId, createColumnOverriddenKey, deriveSpecDelta, distillColumnOverriddenKey, isColumnOverriddenKey, isEmptySpecDelta, mergeSpecOverrides, parseColumnOverriddenId, stringifyColumnOverriddenId, unwrapOverrides } from "./drivers/pframe/spec/overridden.js";
24
- import { extractPObjectId, parseColumnId, parseColumnIdSafely, reconstructSpecFromId, stringifyColumnId } from "./drivers/pframe/spec/ids.js";
25
+ import { extractPObjectId, isColumnUniversalId, isColumnUniversalKey, parseColumnId, parseColumnIdSafely, peelJsonLayers, reconstructSpecFromId, remapColumnIdBlockIds, stringifyColumnId } from "./drivers/pframe/spec/ids.js";
25
26
  import { AnchoredIdDeriver, resolveAnchors } from "./drivers/pframe/spec/anchored.js";
26
27
  import { isAnchoredPColumnId, legacyColumnSelectorsToPredicate, matchAxis, matchMultiColumnSelector, matchPColumn, multiColumnSelectorsToPredicate } from "./drivers/pframe/spec/selectors.js";
27
28
  import { deriveNativeId } from "./drivers/pframe/spec/native_id.js";
@@ -52,4 +53,9 @@ import { convertColumnSelectorToMultiColumnSelector, convertRelaxedAxisSelectorT
52
53
  import { dedupColumns } from "./columns/dedup.js";
53
54
  import { AccessorEntriesProvider, ResultPoolEntriesProvider } from "./columns/providers.js";
54
55
  import "./columns/index.js";
55
- export { AbortError, AccessorEntriesProvider, AllRequiresFeatureFlags, AllSupportsFeatureFlags, AnchoredIdDeriver, Annotation, AnnotationJson, COLLECT_TYPES, ChunkedStreamReader, Code, ColumnRegistry, DESCEND_TYPES, DefaultNavigationState, Domain, DomainJson, IncompatibleFlagsError, LinkerMap, MODEL_SERVICE_METHOD_MAP, ModelServiceRegistry, PAxisName, PColumnName, PFrameDriverError, PFrameError, PFrameSpecDriverError, PTableNA, PlId, PlIdBytes, PlIdLength, PlRef, PoolEntryGuard, REQUIRES_PFRAMES_VERSION, RangeBytes, ResourceTypeName, ResourceTypePrefix, ResultPoolEntriesProvider, RuntimeCapabilities, SERVICE_CAPABILITY_FLAGS, SERVICE_FEATURE_FLAGS, SERVICE_METHOD_MAP, ServiceAlreadyRegisteredError, ServiceError, ServiceInjectionError, ServiceInvalidIdError, ServiceMethodNotFoundError, ServiceNotRegisteredError, Services, UiError, UiServiceRegistry, ValueType, XLSX_MAX_ROWS_PER_SHEET, applyAxisFilters, applySpecOverrides, assertNever, base64Decode, base64Encode, bigintReplacer, buildServiceInfo, canonicalizeAxisId, canonicalizeAxisWithParents, canonicalizeJson, checkBlockFlag, collectSpecQueryColumns, convertColumnSelectorToMultiColumnSelector, convertRelaxedAxisSelectorToMultiAxisSelector, convertRelaxedColumnSelectorToMultiColumnSelector, createColumnDiscoveredId, createColumnDiscoveredKey, createColumnFilteredId, createColumnFilteredKey, createColumnOverriddenId, createColumnOverriddenKey, createEnrichmentRef, createGlobalPObjectId, createLocalPObjectId, createNodeServiceHandlers, createPObjectId, createPlRef, createPrimaryRef, dataInfoToEntries, dedupColumns, deriveNativeId, deriveSpecDelta, deserializeError, deserializeResult, digestPlId, distillColumnDiscoveredKey, distillColumnOverriddenKey, ensureError, ensurePColumn, entriesToDataInfo, executePSpecPredicate, extractAllColumns, extractAllRequirements, extractAllSupports, extractCodeWithInfo, extractConfigGeneric, extractPObjectId, findDescendantsByType, getArrayFromAxisTree, getAxesId, getAxesTree, getAxisId, getColumnIdAndSpec, getDenormalizedAxesList, getFileNameFromHandle, getFilePathFromHandle, getMethodNames, getNormalizedAxesList, getPColumnSpecId, getPTableColumnId, getServiceKind, getServiceModelMethods, getServiceUiMethods, getSetFromAxisTree, getTypeFromPColumnOrAxisSpec, hasAbortError, indexAccessorRoot, indexPoolBlock, isAbortError, isAggregateError, isAnchoredPColumnId, isAnyLogHandle, isAxisId, isBlockUIURL, isBooleanExpression, isColumnDiscoveredId, isColumnDiscoveredKey, isColumnFilteredId, isColumnFilteredKey, isColumnOverriddenKey, isDataInfo, isDataInfoEntries, isEmptySpecDelta, isEnrichmentRef, isFilteredPColumn, isFolderURL, isGlobalPObjectId, isGlobalPObjectKey, isImportFileHandleIndex, isImportFileHandleUpload, isKnownServiceName, isLabelColumn, isLinkerColumn, isLiveLog, isLocalPObjectId, isLocalPObjectKey, isMainService, isNodeService, isPColumn, isPColumnSpec, isPFrameDriverError, isPFrameError, isPFrameSpecDriverError, isPObject, isPObjectId, isPObjectKey, isPTableNA, isPartitionedDataInfoEntries, isPlRef, isPrimaryRef, isServiceAlreadyRegisteredError, isServiceError, isServiceInjectionError, isServiceInvalidIdError, isServiceMethodNotFoundError, isServiceNotRegisteredError, isValueNA, isWasmService, legacyColumnSelectorsToPredicate, listColumnNames, mapDataInfo, mapDataInfoEntries, mapJoinEntry, mapPObjectData, mapPTableDef, mapPTableDefV2, mapSpecQueryColumns, mapValueInVOE, matchAxis, matchAxisId, matchMultiColumnSelector, matchPColumn, matchingModeToConstraints, mergeSpecOverrides, multiColumnSelectorsToPredicate, newRangeBytesOpt, pTableValue, pTableValueBranded, parseColumnDiscoveredId, parseColumnId, parseColumnIdSafely, parseColumnOverriddenId, parseHttpAuth, parseJson, parseJsonSafely, plId, plRefsEqual, readAnnotation, readAnnotationJson, readAnnotationJsonOrThrow, readDomain, readDomainJson, readDomainJsonOrThrow, readMetadata, readMetadataJson, readMetadataJsonOrThrow, reconstructSpecFromId, registerServiceCapabilities, resolveAnchors, resolveAnnotationParents, resolveNodeServiceHandler, resolveRequiredServices, serializeError, serializeHttpAuth, serializeResult, service, serviceFnKey, sortJoinEntry, sortPTableDef, sortSpecQuery, stringifyColumnDiscoveredId, stringifyColumnFilteredId, stringifyColumnId, stringifyColumnOverriddenId, stringifyJson, traverseQuerySpec, uniqueBy, uniquePlId, unwrapOverrides, unwrapResult, validateRangeBytes, visitDataInfo, withEnrichments, wrapAndSerialize, wrapAndSerializeAsync, wrapAsyncCallback, wrapCallback };
56
+ import { formatKindSelector, formatKindSelectorReference, isBlockKindSelectorReference, kindReferenceToSelectorReference, parseKindSelector, parseKindSelectorReference } from "./template/kind_selector.js";
57
+ import { PROJECT_TEMPLATE_SCHEMA_V1, ProjectTemplateV1ParseError, formatTemplateParseIssue, parseBlockPackLocation, parseBlockPackReference, parseProjectTemplateV1, readProjectTemplateV1 } from "./template/project_template_v1.js";
58
+ import { expandTemplateRefs, isTemplatePlRef } from "./template/template_ref_form.js";
59
+ import { relocateBlockIds } from "./template/template_relocate.js";
60
+ import "./template/index.js";
61
+ export { AbortError, AccessorEntriesProvider, AllRequiresFeatureFlags, AllSupportsFeatureFlags, AnchoredIdDeriver, Annotation, AnnotationJson, COLLECT_TYPES, ChunkedStreamReader, Code, ColumnRegistry, DESCEND_TYPES, DefaultNavigationState, Domain, DomainJson, IncompatibleFlagsError, LinkerMap, MODEL_SERVICE_METHOD_MAP, ModelServiceRegistry, PAxisName, PColumnName, PFrameDriverError, PFrameError, PFrameSpecDriverError, PROJECT_TEMPLATE_SCHEMA_V1, PTableNA, PlId, PlIdBytes, PlIdLength, PlRef, PoolEntryGuard, ProjectTemplateV1ParseError, REQUIRES_PFRAMES_VERSION, RangeBytes, ResourceTypeName, ResourceTypePrefix, ResultPoolEntriesProvider, RuntimeCapabilities, SERVICE_CAPABILITY_FLAGS, SERVICE_FEATURE_FLAGS, SERVICE_METHOD_MAP, ServiceAlreadyRegisteredError, ServiceError, ServiceInjectionError, ServiceInvalidIdError, ServiceMethodNotFoundError, ServiceNotRegisteredError, Services, UiError, UiServiceRegistry, ValueType, XLSX_MAX_ROWS_PER_SHEET, applyAxisFilters, applySpecOverrides, assertNever, base64Decode, base64Encode, bigintReplacer, buildServiceInfo, canonicalizeAxisId, canonicalizeAxisWithParents, canonicalizeJson, checkBlockFlag, collectSpecQueryColumns, convertColumnSelectorToMultiColumnSelector, convertRelaxedAxisSelectorToMultiAxisSelector, convertRelaxedColumnSelectorToMultiColumnSelector, createColumnDiscoveredId, createColumnDiscoveredKey, createColumnFilteredId, createColumnFilteredKey, createColumnOverriddenId, createColumnOverriddenKey, createEnrichmentRef, createGlobalPObjectId, createLocalPObjectId, createNodeServiceHandlers, createPObjectId, createPlRef, createPrimaryRef, dataInfoToEntries, dedupColumns, deriveNativeId, deriveSpecDelta, deserializeError, deserializeResult, digestPlId, distillColumnDiscoveredKey, distillColumnOverriddenKey, ensureError, ensurePColumn, entriesToDataInfo, executePSpecPredicate, expandTemplateRefs, extractAllColumns, extractAllRequirements, extractAllSupports, extractCodeWithInfo, extractConfigGeneric, extractPObjectId, findDescendantsByType, formatKindRef, formatKindSelector, formatKindSelectorReference, formatTemplateParseIssue, getArrayFromAxisTree, getAxesId, getAxesTree, getAxisId, getColumnIdAndSpec, getDenormalizedAxesList, getFileNameFromHandle, getFilePathFromHandle, getMethodNames, getNormalizedAxesList, getPColumnSpecId, getPTableColumnId, getServiceKind, getServiceModelMethods, getServiceUiMethods, getSetFromAxisTree, getTypeFromPColumnOrAxisSpec, hasAbortError, indexAccessorRoot, indexPoolBlock, isAbortError, isAggregateError, isAnchoredPColumnId, isAnyLogHandle, isAxisId, isBlockKindSelectorReference, isBlockUIURL, isBooleanExpression, isColumnDiscoveredId, isColumnDiscoveredKey, isColumnFilteredId, isColumnFilteredKey, isColumnOverriddenKey, isColumnUniversalId, isColumnUniversalKey, isDataInfo, isDataInfoEntries, isEmptySpecDelta, isEnrichmentRef, isFilteredPColumn, isFolderURL, isGlobalPObjectId, isGlobalPObjectKey, isImportFileHandleIndex, isImportFileHandleUpload, isKnownServiceName, isLabelColumn, isLinkerColumn, isLiveLog, isLocalPObjectId, isLocalPObjectKey, isMainService, isNodeService, isPColumn, isPColumnSpec, isPFrameDriverError, isPFrameError, isPFrameSpecDriverError, isPObject, isPObjectId, isPObjectKey, isPTableNA, isPartitionedDataInfoEntries, isPlRef, isPrimaryRef, isServiceAlreadyRegisteredError, isServiceError, isServiceInjectionError, isServiceInvalidIdError, isServiceMethodNotFoundError, isServiceNotRegisteredError, isTemplatePlRef, isValueNA, isWasmService, kindReferenceToSelectorReference, legacyColumnSelectorsToPredicate, listColumnNames, mapDataInfo, mapDataInfoEntries, mapJoinEntry, mapPObjectData, mapPTableDef, mapPTableDefV2, mapSpecQueryColumns, mapValueInVOE, matchAxis, matchAxisId, matchMultiColumnSelector, matchPColumn, matchingModeToConstraints, mergeSpecOverrides, multiColumnSelectorsToPredicate, newRangeBytesOpt, pTableValue, pTableValueBranded, parseBlockPackLocation, parseBlockPackReference, parseColumnDiscoveredId, parseColumnId, parseColumnIdSafely, parseColumnOverriddenId, parseHttpAuth, parseJson, parseJsonSafely, parseKindRef, parseKindSelector, parseKindSelectorReference, parseProjectTemplateV1, peelJsonLayers, plId, plRefsEqual, readAnnotation, readAnnotationJson, readAnnotationJsonOrThrow, readDomain, readDomainJson, readDomainJsonOrThrow, readMetadata, readMetadataJson, readMetadataJsonOrThrow, readProjectTemplateV1, reconstructSpecFromId, registerServiceCapabilities, relocateBlockIds, remapColumnIdBlockIds, resolveAnchors, resolveAnnotationParents, resolveNodeServiceHandler, resolveRequiredServices, serializeError, serializeHttpAuth, serializeResult, service, serviceFnKey, sortJoinEntry, sortPTableDef, sortSpecQuery, splitVersionedName, stringifyColumnDiscoveredId, stringifyColumnFilteredId, stringifyColumnId, stringifyColumnOverriddenId, stringifyJson, traverseQuerySpec, uniqueBy, uniquePlId, unwrapOverrides, unwrapResult, validateRangeBytes, visitDataInfo, withEnrichments, wrapAndSerialize, wrapAndSerializeAsync, wrapAsyncCallback, wrapCallback };
package/dist/plid.cjs CHANGED
@@ -5,7 +5,7 @@ let zod = require("zod");
5
5
  const PlIdBytes = 15;
6
6
  /** Characters in string representation */
7
7
  const PlIdLength = 24;
8
- const PlId = zod.z.string().length(24).regex(/[ABCDEFGHIJKLMNOPQRSTUVWXYZ234567]/).brand("PlId");
8
+ const PlId = zod.z.string().length(24).regex(/[ABCDEFGHIJKLMNOPQRSTUVWXYZ234567]/);
9
9
  function uniquePlId() {
10
10
  const data = /* @__PURE__ */ new Uint8Array(15);
11
11
  crypto.getRandomValues(data);
package/dist/plid.cjs.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"plid.cjs","names":["z","base32Encode"],"sources":["../src/plid.ts"],"sourcesContent":["import { z } from \"zod\";\nimport { base32Encode } from \"./base32_encode\";\n\n/** Number of raw bytes in the PlId. */\nexport const PlIdBytes = 15;\n/** Characters in string representation */\nexport const PlIdLength = 24; // = 15 bytes * 8 bits / 5 bits per char in base32\n\nexport const PlId = z\n .string()\n .length(PlIdLength)\n .regex(/[ABCDEFGHIJKLMNOPQRSTUVWXYZ234567]/) // RFC4648\n .brand(\"PlId\");\nexport type PlId = z.infer<typeof PlId>;\n\nexport function uniquePlId(): PlId {\n const data = new Uint8Array(PlIdBytes);\n crypto.getRandomValues(data);\n return PlId.parse(base32Encode(data, \"RFC4648\"));\n}\n\nexport function plId(bytes: Uint8Array): PlId {\n if (bytes.length !== PlIdBytes) throw new Error(`Wrong number of bytes: ${bytes.length}`);\n return PlId.parse(base32Encode(bytes, \"RFC4648\"));\n}\n\nexport async function digestPlId(data: string): Promise<PlId> {\n const encoder = new TextEncoder();\n const bytes = await crypto.subtle.digest(\"SHA-256\", encoder.encode(data));\n return plId(new Uint8Array(bytes.slice(0, 15)));\n}\n"],"mappings":";;;;AAIA,MAAa,YAAY;;AAEzB,MAAa,aAAa;AAE1B,MAAa,OAAOA,IAAAA,EACjB,OAAO,CAAC,CACR,OAAA,EAAiB,CAAC,CAClB,MAAM,oCAAoC,CAAC,CAC3C,MAAM,MAAM;AAGf,SAAgB,aAAmB;CACjC,MAAM,uBAAO,IAAI,WAAA,EAAoB;CACrC,OAAO,gBAAgB,IAAI;CAC3B,OAAO,KAAK,MAAMC,sBAAAA,aAAa,MAAM,SAAS,CAAC;AACjD;AAEA,SAAgB,KAAK,OAAyB;CAC5C,IAAI,MAAM,WAAA,IAAsB,MAAM,IAAI,MAAM,0BAA0B,MAAM,QAAQ;CACxF,OAAO,KAAK,MAAMA,sBAAAA,aAAa,OAAO,SAAS,CAAC;AAClD;AAEA,eAAsB,WAAW,MAA6B;CAC5D,MAAM,UAAU,IAAI,YAAY;CAChC,MAAM,QAAQ,MAAM,OAAO,OAAO,OAAO,WAAW,QAAQ,OAAO,IAAI,CAAC;CACxE,OAAO,KAAK,IAAI,WAAW,MAAM,MAAM,GAAG,EAAE,CAAC,CAAC;AAChD"}
1
+ {"version":3,"file":"plid.cjs","names":["z","base32Encode"],"sources":["../src/plid.ts"],"sourcesContent":["import { z } from \"zod\";\nimport { base32Encode } from \"./base32_encode\";\nimport { Branded } from \"@milaboratories/helpers\";\n\n/** Number of raw bytes in the PlId. */\nexport const PlIdBytes = 15;\n/** Characters in string representation */\nexport const PlIdLength = 24; // = 15 bytes * 8 bits / 5 bits per char in base32\n\nexport const PlId = z\n .string()\n .length(PlIdLength)\n .regex(/[ABCDEFGHIJKLMNOPQRSTUVWXYZ234567]/); // RFC4648\nexport type PlId = Branded<z.infer<typeof PlId>, \"PlId\">;\n\nexport function uniquePlId(): PlId {\n const data = new Uint8Array(PlIdBytes);\n crypto.getRandomValues(data);\n return PlId.parse(base32Encode(data, \"RFC4648\")) as PlId;\n}\n\nexport function plId(bytes: Uint8Array): PlId {\n if (bytes.length !== PlIdBytes) throw new Error(`Wrong number of bytes: ${bytes.length}`);\n return PlId.parse(base32Encode(bytes, \"RFC4648\")) as PlId;\n}\n\nexport async function digestPlId(data: string): Promise<PlId> {\n const encoder = new TextEncoder();\n const bytes = await crypto.subtle.digest(\"SHA-256\", encoder.encode(data));\n return plId(new Uint8Array(bytes.slice(0, 15)));\n}\n"],"mappings":";;;;AAKA,MAAa,YAAY;;AAEzB,MAAa,aAAa;AAE1B,MAAa,OAAOA,IAAAA,EACjB,OAAO,CAAC,CACR,OAAA,EAAiB,CAAC,CAClB,MAAM,oCAAoC;AAG7C,SAAgB,aAAmB;CACjC,MAAM,uBAAO,IAAI,WAAA,EAAoB;CACrC,OAAO,gBAAgB,IAAI;CAC3B,OAAO,KAAK,MAAMC,sBAAAA,aAAa,MAAM,SAAS,CAAC;AACjD;AAEA,SAAgB,KAAK,OAAyB;CAC5C,IAAI,MAAM,WAAA,IAAsB,MAAM,IAAI,MAAM,0BAA0B,MAAM,QAAQ;CACxF,OAAO,KAAK,MAAMA,sBAAAA,aAAa,OAAO,SAAS,CAAC;AAClD;AAEA,eAAsB,WAAW,MAA6B;CAC5D,MAAM,UAAU,IAAI,YAAY;CAChC,MAAM,QAAQ,MAAM,OAAO,OAAO,OAAO,WAAW,QAAQ,OAAO,IAAI,CAAC;CACxE,OAAO,KAAK,IAAI,WAAW,MAAM,MAAM,GAAG,EAAE,CAAC,CAAC;AAChD"}
package/dist/plid.d.ts CHANGED
@@ -1,12 +1,13 @@
1
1
  import { z } from "zod";
2
+ import { Branded } from "@milaboratories/helpers";
2
3
 
3
4
  //#region src/plid.d.ts
4
5
  /** Number of raw bytes in the PlId. */
5
6
  declare const PlIdBytes = 15;
6
7
  /** Characters in string representation */
7
8
  declare const PlIdLength = 24;
8
- declare const PlId: z.ZodBranded<z.ZodString, "PlId">;
9
- type PlId = z.infer<typeof PlId>;
9
+ declare const PlId: z.ZodString;
10
+ type PlId = Branded<z.infer<typeof PlId>, "PlId">;
10
11
  declare function uniquePlId(): PlId;
11
12
  declare function plId(bytes: Uint8Array): PlId;
12
13
  declare function digestPlId(data: string): Promise<PlId>;
@@ -1 +1 @@
1
- {"version":3,"file":"plid.d.ts","names":[],"sources":["../src/plid.ts"],"mappings":";;;;cAIa,SAAA;AAAb;AAAA,cAEa,UAAA;AAAA,cAEA,IAAA,EAAI,CAAA,CAAA,UAAA,CAAA,CAAA,CAAA,SAAA;AAAA,KAKL,IAAA,GAAO,CAAA,CAAE,KAAK,QAAQ,IAAA;AAAA,iBAElB,UAAA,IAAc,IAAI;AAAA,iBAMlB,IAAA,CAAK,KAAA,EAAO,UAAA,GAAa,IAAI;AAAA,iBAKvB,UAAA,CAAW,IAAA,WAAe,OAAO,CAAC,IAAA"}
1
+ {"version":3,"file":"plid.d.ts","names":[],"sources":["../src/plid.ts"],"mappings":";;;;;cAKa,SAAA;AAAb;AAAA,cAEa,UAAA;AAAA,cAEA,IAAA,EAAI,CAAA,CAAA,SAG6B;AAAA,KAClC,IAAA,GAAO,OAAA,CAAQ,CAAA,CAAE,KAAA,QAAa,IAAA;AAAA,iBAE1B,UAAA,IAAc,IAAI;AAAA,iBAMlB,IAAA,CAAK,KAAA,EAAO,UAAA,GAAa,IAAI;AAAA,iBAKvB,UAAA,CAAW,IAAA,WAAe,OAAO,CAAC,IAAA"}
package/dist/plid.js CHANGED
@@ -5,7 +5,7 @@ import { z } from "zod";
5
5
  const PlIdBytes = 15;
6
6
  /** Characters in string representation */
7
7
  const PlIdLength = 24;
8
- const PlId = z.string().length(24).regex(/[ABCDEFGHIJKLMNOPQRSTUVWXYZ234567]/).brand("PlId");
8
+ const PlId = z.string().length(24).regex(/[ABCDEFGHIJKLMNOPQRSTUVWXYZ234567]/);
9
9
  function uniquePlId() {
10
10
  const data = /* @__PURE__ */ new Uint8Array(15);
11
11
  crypto.getRandomValues(data);
package/dist/plid.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"plid.js","names":[],"sources":["../src/plid.ts"],"sourcesContent":["import { z } from \"zod\";\nimport { base32Encode } from \"./base32_encode\";\n\n/** Number of raw bytes in the PlId. */\nexport const PlIdBytes = 15;\n/** Characters in string representation */\nexport const PlIdLength = 24; // = 15 bytes * 8 bits / 5 bits per char in base32\n\nexport const PlId = z\n .string()\n .length(PlIdLength)\n .regex(/[ABCDEFGHIJKLMNOPQRSTUVWXYZ234567]/) // RFC4648\n .brand(\"PlId\");\nexport type PlId = z.infer<typeof PlId>;\n\nexport function uniquePlId(): PlId {\n const data = new Uint8Array(PlIdBytes);\n crypto.getRandomValues(data);\n return PlId.parse(base32Encode(data, \"RFC4648\"));\n}\n\nexport function plId(bytes: Uint8Array): PlId {\n if (bytes.length !== PlIdBytes) throw new Error(`Wrong number of bytes: ${bytes.length}`);\n return PlId.parse(base32Encode(bytes, \"RFC4648\"));\n}\n\nexport async function digestPlId(data: string): Promise<PlId> {\n const encoder = new TextEncoder();\n const bytes = await crypto.subtle.digest(\"SHA-256\", encoder.encode(data));\n return plId(new Uint8Array(bytes.slice(0, 15)));\n}\n"],"mappings":";;;;AAIA,MAAa,YAAY;;AAEzB,MAAa,aAAa;AAE1B,MAAa,OAAO,EACjB,OAAO,CAAC,CACR,OAAA,EAAiB,CAAC,CAClB,MAAM,oCAAoC,CAAC,CAC3C,MAAM,MAAM;AAGf,SAAgB,aAAmB;CACjC,MAAM,uBAAO,IAAI,WAAA,EAAoB;CACrC,OAAO,gBAAgB,IAAI;CAC3B,OAAO,KAAK,MAAM,aAAa,MAAM,SAAS,CAAC;AACjD;AAEA,SAAgB,KAAK,OAAyB;CAC5C,IAAI,MAAM,WAAA,IAAsB,MAAM,IAAI,MAAM,0BAA0B,MAAM,QAAQ;CACxF,OAAO,KAAK,MAAM,aAAa,OAAO,SAAS,CAAC;AAClD;AAEA,eAAsB,WAAW,MAA6B;CAC5D,MAAM,UAAU,IAAI,YAAY;CAChC,MAAM,QAAQ,MAAM,OAAO,OAAO,OAAO,WAAW,QAAQ,OAAO,IAAI,CAAC;CACxE,OAAO,KAAK,IAAI,WAAW,MAAM,MAAM,GAAG,EAAE,CAAC,CAAC;AAChD"}
1
+ {"version":3,"file":"plid.js","names":[],"sources":["../src/plid.ts"],"sourcesContent":["import { z } from \"zod\";\nimport { base32Encode } from \"./base32_encode\";\nimport { Branded } from \"@milaboratories/helpers\";\n\n/** Number of raw bytes in the PlId. */\nexport const PlIdBytes = 15;\n/** Characters in string representation */\nexport const PlIdLength = 24; // = 15 bytes * 8 bits / 5 bits per char in base32\n\nexport const PlId = z\n .string()\n .length(PlIdLength)\n .regex(/[ABCDEFGHIJKLMNOPQRSTUVWXYZ234567]/); // RFC4648\nexport type PlId = Branded<z.infer<typeof PlId>, \"PlId\">;\n\nexport function uniquePlId(): PlId {\n const data = new Uint8Array(PlIdBytes);\n crypto.getRandomValues(data);\n return PlId.parse(base32Encode(data, \"RFC4648\")) as PlId;\n}\n\nexport function plId(bytes: Uint8Array): PlId {\n if (bytes.length !== PlIdBytes) throw new Error(`Wrong number of bytes: ${bytes.length}`);\n return PlId.parse(base32Encode(bytes, \"RFC4648\")) as PlId;\n}\n\nexport async function digestPlId(data: string): Promise<PlId> {\n const encoder = new TextEncoder();\n const bytes = await crypto.subtle.digest(\"SHA-256\", encoder.encode(data));\n return plId(new Uint8Array(bytes.slice(0, 15)));\n}\n"],"mappings":";;;;AAKA,MAAa,YAAY;;AAEzB,MAAa,aAAa;AAE1B,MAAa,OAAO,EACjB,OAAO,CAAC,CACR,OAAA,EAAiB,CAAC,CAClB,MAAM,oCAAoC;AAG7C,SAAgB,aAAmB;CACjC,MAAM,uBAAO,IAAI,WAAA,EAAoB;CACrC,OAAO,gBAAgB,IAAI;CAC3B,OAAO,KAAK,MAAM,aAAa,MAAM,SAAS,CAAC;AACjD;AAEA,SAAgB,KAAK,OAAyB;CAC5C,IAAI,MAAM,WAAA,IAAsB,MAAM,IAAI,MAAM,0BAA0B,MAAM,QAAQ;CACxF,OAAO,KAAK,MAAM,aAAa,OAAO,SAAS,CAAC;AAClD;AAEA,eAAsB,WAAW,MAA6B;CAC5D,MAAM,UAAU,IAAI,YAAY;CAChC,MAAM,QAAQ,MAAM,OAAO,OAAO,OAAO,WAAW,QAAQ,OAAO,IAAI,CAAC;CACxE,OAAO,KAAK,IAAI,WAAW,MAAM,MAAM,GAAG,EAAE,CAAC,CAAC;AAChD"}
@@ -0,0 +1,20 @@
1
+ const require_kind_selector = require("./kind_selector.cjs");
2
+ const require_project_template_v1 = require("./project_template_v1.cjs");
3
+ const require_template_ref_form = require("./template_ref_form.cjs");
4
+ const require_template_relocate = require("./template_relocate.cjs");
5
+ exports.PROJECT_TEMPLATE_SCHEMA_V1 = require_project_template_v1.PROJECT_TEMPLATE_SCHEMA_V1;
6
+ exports.ProjectTemplateV1ParseError = require_project_template_v1.ProjectTemplateV1ParseError;
7
+ exports.expandTemplateRefs = require_template_ref_form.expandTemplateRefs;
8
+ exports.formatKindSelector = require_kind_selector.formatKindSelector;
9
+ exports.formatKindSelectorReference = require_kind_selector.formatKindSelectorReference;
10
+ exports.formatTemplateParseIssue = require_project_template_v1.formatTemplateParseIssue;
11
+ exports.isBlockKindSelectorReference = require_kind_selector.isBlockKindSelectorReference;
12
+ exports.isTemplatePlRef = require_template_ref_form.isTemplatePlRef;
13
+ exports.kindReferenceToSelectorReference = require_kind_selector.kindReferenceToSelectorReference;
14
+ exports.parseBlockPackLocation = require_project_template_v1.parseBlockPackLocation;
15
+ exports.parseBlockPackReference = require_project_template_v1.parseBlockPackReference;
16
+ exports.parseKindSelector = require_kind_selector.parseKindSelector;
17
+ exports.parseKindSelectorReference = require_kind_selector.parseKindSelectorReference;
18
+ exports.parseProjectTemplateV1 = require_project_template_v1.parseProjectTemplateV1;
19
+ exports.readProjectTemplateV1 = require_project_template_v1.readProjectTemplateV1;
20
+ exports.relocateBlockIds = require_template_relocate.relocateBlockIds;
@@ -0,0 +1,5 @@
1
+ import { BlockKindSelectorReference, KindSelector, KindSelectorOp, formatKindSelector, formatKindSelectorReference, isBlockKindSelectorReference, kindReferenceToSelectorReference, parseKindSelector, parseKindSelectorReference } from "./kind_selector.js";
2
+ import { BlockPackLocationReference, BlockPackLocatorOverride, BlockPackReference, PROJECT_TEMPLATE_SCHEMA_V1, ProjectTemplateSchemaV1, ProjectTemplateV1, ProjectTemplateV1Entry, ProjectTemplateV1ParseError, ProjectTemplateV1ReadResult, TemplateParseIssue, formatTemplateParseIssue, parseBlockPackLocation, parseBlockPackReference, parseProjectTemplateV1, readProjectTemplateV1 } from "./project_template_v1.js";
3
+ import { TemplatePlRef, expandTemplateRefs, isTemplatePlRef } from "./template_ref_form.js";
4
+ import { relocateBlockIds } from "./template_relocate.js";
5
+ export { BlockKindSelectorReference, BlockPackLocationReference, BlockPackLocatorOverride, BlockPackReference, KindSelector, KindSelectorOp, PROJECT_TEMPLATE_SCHEMA_V1, ProjectTemplateSchemaV1, ProjectTemplateV1, ProjectTemplateV1Entry, ProjectTemplateV1ParseError, ProjectTemplateV1ReadResult, TemplateParseIssue, TemplatePlRef, expandTemplateRefs, formatKindSelector, formatKindSelectorReference, formatTemplateParseIssue, isBlockKindSelectorReference, isTemplatePlRef, kindReferenceToSelectorReference, parseBlockPackLocation, parseBlockPackReference, parseKindSelector, parseKindSelectorReference, parseProjectTemplateV1, readProjectTemplateV1, relocateBlockIds };
@@ -0,0 +1,5 @@
1
+ import { formatKindSelector, formatKindSelectorReference, isBlockKindSelectorReference, kindReferenceToSelectorReference, parseKindSelector, parseKindSelectorReference } from "./kind_selector.js";
2
+ import { PROJECT_TEMPLATE_SCHEMA_V1, ProjectTemplateV1ParseError, formatTemplateParseIssue, parseBlockPackLocation, parseBlockPackReference, parseProjectTemplateV1, readProjectTemplateV1 } from "./project_template_v1.js";
3
+ import { expandTemplateRefs, isTemplatePlRef } from "./template_ref_form.js";
4
+ import { relocateBlockIds } from "./template_relocate.js";
5
+ export { PROJECT_TEMPLATE_SCHEMA_V1, ProjectTemplateV1ParseError, expandTemplateRefs, formatKindSelector, formatKindSelectorReference, formatTemplateParseIssue, isBlockKindSelectorReference, isTemplatePlRef, kindReferenceToSelectorReference, parseBlockPackLocation, parseBlockPackReference, parseKindSelector, parseKindSelectorReference, parseProjectTemplateV1, readProjectTemplateV1, relocateBlockIds };
@@ -0,0 +1,92 @@
1
+ const require_block_kind_ref = require("../bmodel/block_kind_ref.cjs");
2
+ //#region src/template/kind_selector.ts
3
+ /** `X.Y.Z` with optional semver prerelease and build metadata. */
4
+ const semVerRegex = /^\d+\.\d+\.\d+(?:-[\dA-Za-z-]+(?:\.[\dA-Za-z-]+)*)?(?:\+[\dA-Za-z-]+(?:\.[\dA-Za-z-]+)*)?$/;
5
+ /**
6
+ * Split a raw selector string (`1.2.0`, `~1.2.0`, `^1.2.0`) into its parts.
7
+ *
8
+ * The version is validated as `X.Y.Z`, so a range that is legal npm but not part
9
+ * of the kind grammar (`>=1.0.0`, `1.x`, `latest`) is rejected here rather than
10
+ * reaching resolution. Note the deliberate divergence from
11
+ * `tools/block-tools`'s `parseSelector`, which additionally tolerates a leading
12
+ * `@` as `exact`: after the `{name}@{selector}` split a leading `@` can only
13
+ * come from a doubled separator, which is malformed.
14
+ *
15
+ * Mapping a selector onto a concrete version is resolution, not parsing, and
16
+ * lives with the resolver (`kind_resolver.selectorToRange`).
17
+ *
18
+ * @throws if the version part is not `X.Y.Z`
19
+ */
20
+ function parseKindSelector(raw) {
21
+ const s = raw.trim();
22
+ const op = s.startsWith("~") ? "patch" : s.startsWith("^") ? "minor" : "exact";
23
+ const version = op === "exact" ? s : s.slice(1);
24
+ if (!semVerRegex.test(version)) throw new Error(`Malformed kind version selector (expected 'X.Y.Z', '~X.Y.Z' or '^X.Y.Z'): ${raw}`);
25
+ return {
26
+ op,
27
+ version
28
+ };
29
+ }
30
+ /** Render a {@link KindSelector} back to its on-wire string. */
31
+ function formatKindSelector(sel) {
32
+ switch (sel.op) {
33
+ case "exact": return sel.version;
34
+ case "patch": return `~${sel.version}`;
35
+ case "minor": return `^${sel.version}`;
36
+ }
37
+ }
38
+ /**
39
+ * Split a {@link BlockKindSelectorReference} into `{ name, selector }`.
40
+ *
41
+ * @throws if the reference carries no version segment, or the selector is
42
+ * outside the `X.Y.Z` / `~X.Y.Z` / `^X.Y.Z` grammar
43
+ */
44
+ function parseKindSelectorReference(ref) {
45
+ const { name, version } = require_block_kind_ref.splitVersionedName(ref, "kind selector reference", "{name}@{selector}");
46
+ return {
47
+ name,
48
+ selector: parseKindSelector(version)
49
+ };
50
+ }
51
+ /**
52
+ * Compose a {@link BlockKindSelectorReference} from a name and selector.
53
+ *
54
+ * A formatter, not a validator — pass a selector that came from
55
+ * {@link parseKindSelector} or that you constructed from a known-good version.
56
+ */
57
+ function formatKindSelectorReference(k) {
58
+ return `${k.name}@${formatKindSelector(k.selector)}`;
59
+ }
60
+ /**
61
+ * Widen a resolved {@link BlockKindReference} to its `exact`-tier selector form.
62
+ *
63
+ * The export direction: a block implements exactly one kind version, so export
64
+ * always emits `{name}@X.Y.Z`. Validates on the way through, so a
65
+ * malformed stored reference fails at the boundary rather than in the file.
66
+ */
67
+ function kindReferenceToSelectorReference(ref) {
68
+ const { name, version } = require_block_kind_ref.parseKindRef(ref);
69
+ return formatKindSelectorReference({
70
+ name,
71
+ selector: parseKindSelector(version)
72
+ });
73
+ }
74
+ /** Whether `value` is a well-formed `{name}@{selector}` string. */
75
+ function isBlockKindSelectorReference(value) {
76
+ if (typeof value !== "string") return false;
77
+ try {
78
+ parseKindSelectorReference(value);
79
+ return true;
80
+ } catch {
81
+ return false;
82
+ }
83
+ }
84
+ //#endregion
85
+ exports.formatKindSelector = formatKindSelector;
86
+ exports.formatKindSelectorReference = formatKindSelectorReference;
87
+ exports.isBlockKindSelectorReference = isBlockKindSelectorReference;
88
+ exports.kindReferenceToSelectorReference = kindReferenceToSelectorReference;
89
+ exports.parseKindSelector = parseKindSelector;
90
+ exports.parseKindSelectorReference = parseKindSelectorReference;
91
+
92
+ //# sourceMappingURL=kind_selector.cjs.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"kind_selector.cjs","names":["splitVersionedName","parseKindRef"],"sources":["../../src/template/kind_selector.ts"],"sourcesContent":["import type { Branded } from \"@milaboratories/helpers\";\nimport type { BlockKindReference } from \"../bmodel/block_kind_ref\";\nimport { parseKindRef, splitVersionedName } from \"../bmodel/block_kind_ref\";\n\n/**\n * Version-selection tier of a template entry's `kind` field.\n *\n * - `exact` — `X.Y.Z`: this version and no other.\n * - `patch` — `~X.Y.Z`: patch floor, behavior frozen.\n * - `minor` — `^X.Y.Z`: minor floor, behavior floats.\n */\nexport type KindSelectorOp = \"exact\" | \"patch\" | \"minor\";\n\n/** The version half of a `{name}@{selector}` kind reference, split into parts. */\nexport type KindSelector = {\n readonly op: KindSelectorOp;\n readonly version: string;\n};\n\n/**\n * On-wire reference to a *set* of block kind versions: `{name}@{selector}`, e.g.\n * `@platforma-open/milaboratories.mixcr-clonotyping.kind@~1.2.0`.\n *\n * The template-file form of a kind reference, and the only form the\n * `template-v1` schema accepts in an entry's `kind` field. It is the same string\n * shape as {@link BlockKindReference} widened by the `~`/`^` tiers, but branded\n * separately so a *resolved* kind reference is never silently passed where a\n * selector is expected, or vice versa. Widen an exact reference explicitly with\n * {@link kindReferenceToSelectorReference}.\n */\nexport type BlockKindSelectorReference = Branded<string, \"BlockKindSelectorReference\">;\n\n/** `X.Y.Z` with optional semver prerelease and build metadata. */\nconst semVerRegex =\n /^\\d+\\.\\d+\\.\\d+(?:-[\\dA-Za-z-]+(?:\\.[\\dA-Za-z-]+)*)?(?:\\+[\\dA-Za-z-]+(?:\\.[\\dA-Za-z-]+)*)?$/;\n\n/**\n * Split a raw selector string (`1.2.0`, `~1.2.0`, `^1.2.0`) into its parts.\n *\n * The version is validated as `X.Y.Z`, so a range that is legal npm but not part\n * of the kind grammar (`>=1.0.0`, `1.x`, `latest`) is rejected here rather than\n * reaching resolution. Note the deliberate divergence from\n * `tools/block-tools`'s `parseSelector`, which additionally tolerates a leading\n * `@` as `exact`: after the `{name}@{selector}` split a leading `@` can only\n * come from a doubled separator, which is malformed.\n *\n * Mapping a selector onto a concrete version is resolution, not parsing, and\n * lives with the resolver (`kind_resolver.selectorToRange`).\n *\n * @throws if the version part is not `X.Y.Z`\n */\nexport function parseKindSelector(raw: string): KindSelector {\n const s = raw.trim();\n const op: KindSelectorOp = s.startsWith(\"~\") ? \"patch\" : s.startsWith(\"^\") ? \"minor\" : \"exact\";\n const version = op === \"exact\" ? s : s.slice(1);\n if (!semVerRegex.test(version)) {\n throw new Error(\n `Malformed kind version selector (expected 'X.Y.Z', '~X.Y.Z' or '^X.Y.Z'): ${raw}`,\n );\n }\n return { op, version };\n}\n\n/** Render a {@link KindSelector} back to its on-wire string. */\nexport function formatKindSelector(sel: KindSelector): string {\n switch (sel.op) {\n case \"exact\":\n return sel.version;\n case \"patch\":\n return `~${sel.version}`;\n case \"minor\":\n return `^${sel.version}`;\n }\n}\n\n/**\n * Split a {@link BlockKindSelectorReference} into `{ name, selector }`.\n *\n * @throws if the reference carries no version segment, or the selector is\n * outside the `X.Y.Z` / `~X.Y.Z` / `^X.Y.Z` grammar\n */\nexport function parseKindSelectorReference(ref: BlockKindSelectorReference): {\n name: string;\n selector: KindSelector;\n} {\n const { name, version } = splitVersionedName(ref, \"kind selector reference\", \"{name}@{selector}\");\n return { name, selector: parseKindSelector(version) };\n}\n\n/**\n * Compose a {@link BlockKindSelectorReference} from a name and selector.\n *\n * A formatter, not a validator — pass a selector that came from\n * {@link parseKindSelector} or that you constructed from a known-good version.\n */\nexport function formatKindSelectorReference(k: {\n name: string;\n selector: KindSelector;\n}): BlockKindSelectorReference {\n return `${k.name}@${formatKindSelector(k.selector)}` as BlockKindSelectorReference;\n}\n\n/**\n * Widen a resolved {@link BlockKindReference} to its `exact`-tier selector form.\n *\n * The export direction: a block implements exactly one kind version, so export\n * always emits `{name}@X.Y.Z`. Validates on the way through, so a\n * malformed stored reference fails at the boundary rather than in the file.\n */\nexport function kindReferenceToSelectorReference(\n ref: BlockKindReference,\n): BlockKindSelectorReference {\n const { name, version } = parseKindRef(ref);\n return formatKindSelectorReference({ name, selector: parseKindSelector(version) });\n}\n\n/** Whether `value` is a well-formed `{name}@{selector}` string. */\nexport function isBlockKindSelectorReference(value: unknown): value is BlockKindSelectorReference {\n if (typeof value !== \"string\") return false;\n try {\n parseKindSelectorReference(value as BlockKindSelectorReference);\n return true;\n } catch {\n return false;\n }\n}\n"],"mappings":";;;AAiCA,MAAM,cACJ;;;;;;;;;;;;;;;;AAiBF,SAAgB,kBAAkB,KAA2B;CAC3D,MAAM,IAAI,IAAI,KAAK;CACnB,MAAM,KAAqB,EAAE,WAAW,GAAG,IAAI,UAAU,EAAE,WAAW,GAAG,IAAI,UAAU;CACvF,MAAM,UAAU,OAAO,UAAU,IAAI,EAAE,MAAM,CAAC;CAC9C,IAAI,CAAC,YAAY,KAAK,OAAO,GAC3B,MAAM,IAAI,MACR,6EAA6E,KAC/E;CAEF,OAAO;EAAE;EAAI;CAAQ;AACvB;;AAGA,SAAgB,mBAAmB,KAA2B;CAC5D,QAAQ,IAAI,IAAZ;EACE,KAAK,SACH,OAAO,IAAI;EACb,KAAK,SACH,OAAO,IAAI,IAAI;EACjB,KAAK,SACH,OAAO,IAAI,IAAI;CACnB;AACF;;;;;;;AAQA,SAAgB,2BAA2B,KAGzC;CACA,MAAM,EAAE,MAAM,YAAYA,uBAAAA,mBAAmB,KAAK,2BAA2B,mBAAmB;CAChG,OAAO;EAAE;EAAM,UAAU,kBAAkB,OAAO;CAAE;AACtD;;;;;;;AAQA,SAAgB,4BAA4B,GAGb;CAC7B,OAAO,GAAG,EAAE,KAAK,GAAG,mBAAmB,EAAE,QAAQ;AACnD;;;;;;;;AASA,SAAgB,iCACd,KAC4B;CAC5B,MAAM,EAAE,MAAM,YAAYC,uBAAAA,aAAa,GAAG;CAC1C,OAAO,4BAA4B;EAAE;EAAM,UAAU,kBAAkB,OAAO;CAAE,CAAC;AACnF;;AAGA,SAAgB,6BAA6B,OAAqD;CAChG,IAAI,OAAO,UAAU,UAAU,OAAO;CACtC,IAAI;EACF,2BAA2B,KAAmC;EAC9D,OAAO;CACT,QAAQ;EACN,OAAO;CACT;AACF"}