@agentshouse/mdmodel 0.1.0-cad192ab63d5f → 0.1.0-caefdbe3e3d42

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 (129) hide show
  1. package/API.md +227 -182
  2. package/README.md +21 -22
  3. package/dist/blocks.d.ts.map +1 -1
  4. package/dist/blocks.js +35 -20
  5. package/dist/condition.d.ts +43 -14
  6. package/dist/condition.d.ts.map +1 -1
  7. package/dist/condition.js +225 -129
  8. package/dist/definition.d.ts +17 -1
  9. package/dist/definition.d.ts.map +1 -1
  10. package/dist/definition.js +238 -22
  11. package/dist/divide.d.ts.map +1 -1
  12. package/dist/divide.js +27 -17
  13. package/dist/document.d.ts +5 -5
  14. package/dist/document.d.ts.map +1 -1
  15. package/dist/document.js +304 -187
  16. package/dist/index.d.ts +21 -9
  17. package/dist/index.d.ts.map +1 -1
  18. package/dist/index.js +12 -6
  19. package/dist/kinds.d.ts +18 -0
  20. package/dist/kinds.d.ts.map +1 -0
  21. package/dist/kinds.js +141 -0
  22. package/dist/links.d.ts +2 -0
  23. package/dist/links.d.ts.map +1 -1
  24. package/dist/links.js +107 -50
  25. package/dist/paths.d.ts +9 -1
  26. package/dist/paths.d.ts.map +1 -1
  27. package/dist/paths.js +28 -2
  28. package/dist/pattern.d.ts +10 -0
  29. package/dist/pattern.d.ts.map +1 -0
  30. package/dist/pattern.js +355 -0
  31. package/dist/project.d.ts +1 -0
  32. package/dist/project.d.ts.map +1 -1
  33. package/dist/project.js +38 -15
  34. package/dist/query/language.d.ts +218 -0
  35. package/dist/query/language.d.ts.map +1 -0
  36. package/dist/query/language.js +526 -0
  37. package/dist/query/match.d.ts +12 -0
  38. package/dist/query/match.d.ts.map +1 -0
  39. package/dist/query/match.js +118 -0
  40. package/dist/query/rows.d.ts +32 -0
  41. package/dist/query/rows.d.ts.map +1 -0
  42. package/dist/query/rows.js +161 -0
  43. package/dist/query/sql.d.ts +39 -0
  44. package/dist/query/sql.d.ts.map +1 -0
  45. package/dist/query/sql.js +279 -0
  46. package/dist/references.d.ts.map +1 -1
  47. package/dist/references.js +6 -1
  48. package/dist/reserved.d.ts +5 -0
  49. package/dist/reserved.d.ts.map +1 -0
  50. package/dist/reserved.js +20 -0
  51. package/dist/schema.d.ts +1 -0
  52. package/dist/schema.d.ts.map +1 -1
  53. package/dist/schema.js +55 -4
  54. package/dist/types.d.ts +35 -4
  55. package/dist/types.d.ts.map +1 -1
  56. package/dist/validate.d.ts +28 -3
  57. package/dist/validate.d.ts.map +1 -1
  58. package/dist/validate.js +308 -77
  59. package/dist/yaml.d.ts.map +1 -1
  60. package/dist/yaml.js +36 -3
  61. package/fixtures/README.md +26 -6
  62. package/fixtures/cases/conditional-section/context.json +1 -0
  63. package/fixtures/cases/conditional-section/expected.json +6 -0
  64. package/fixtures/cases/conditional-section/library/questions/hosting.md +9 -0
  65. package/fixtures/cases/conditional-section/library/questions/payments.md +12 -0
  66. package/fixtures/cases/conditional-section/schema.yaml +14 -0
  67. package/fixtures/cases/cross-room-link/context.json +1 -0
  68. package/fixtures/cases/cross-room-link/expected.json +1 -0
  69. package/fixtures/cases/cross-room-link/library/clients/acme.md +6 -0
  70. package/fixtures/cases/cross-room-link/schema.yaml +3 -0
  71. package/fixtures/cases/cross-room-reference/context.json +1 -0
  72. package/fixtures/cases/cross-room-reference/expected.json +1 -0
  73. package/fixtures/cases/cross-room-reference/library/clients/acme.md +9 -0
  74. package/fixtures/cases/cross-room-reference/schema.yaml +9 -0
  75. package/fixtures/cases/link-into-a-reserved-name/context.json +1 -0
  76. package/fixtures/cases/link-into-a-reserved-name/expected.json +5 -0
  77. package/fixtures/cases/link-into-a-reserved-name/library/notes/a.md +6 -0
  78. package/fixtures/cases/link-into-a-reserved-name/schema.yaml +3 -0
  79. package/fixtures/cases/link-into-a-reserved-name-from-an-untyped-document/context.json +1 -0
  80. package/fixtures/cases/link-into-a-reserved-name-from-an-untyped-document/expected.json +5 -0
  81. package/fixtures/cases/link-into-a-reserved-name-from-an-untyped-document/library/notes/b.md +5 -0
  82. package/fixtures/cases/member-on-an-untyped-document/context.json +1 -0
  83. package/fixtures/cases/member-on-an-untyped-document/expected.json +6 -0
  84. package/fixtures/cases/member-on-an-untyped-document/library/note.md +4 -0
  85. package/fixtures/cases/member-on-another-type/context.json +1 -0
  86. package/fixtures/cases/member-on-another-type/expected.json +6 -0
  87. package/fixtures/cases/member-on-another-type/library/note.md +4 -0
  88. package/fixtures/cases/member-on-another-type/schema.yaml +7 -0
  89. package/fixtures/cases/reference-into-a-reserved-name/context.json +1 -0
  90. package/fixtures/cases/reference-into-a-reserved-name/expected.json +6 -0
  91. package/fixtures/cases/reference-into-a-reserved-name/library/notes/a.md +4 -0
  92. package/fixtures/cases/reference-into-a-reserved-name/library/settings/brief.md +1 -0
  93. package/fixtures/cases/reference-into-a-reserved-name/schema.yaml +3 -0
  94. package/fixtures/cases/room-md-declares-a-type/context.json +1 -0
  95. package/fixtures/cases/room-md-declares-a-type/expected.json +6 -0
  96. package/fixtures/cases/room-md-declares-a-type/library/ROOM.md +5 -0
  97. package/fixtures/cases/typed-path-names-another-type/context.json +11 -0
  98. package/fixtures/cases/typed-path-names-another-type/expected.json +6 -0
  99. package/fixtures/cases/typed-path-names-another-type/library/settings/prefs/one.md +3 -0
  100. package/fixtures/cases/typed-path-names-another-type/schema.yaml +6 -0
  101. package/fixtures/cases/typed-path-names-its-type/context.json +11 -0
  102. package/fixtures/cases/typed-path-names-its-type/expected.json +3 -0
  103. package/fixtures/cases/typed-path-names-its-type/library/settings/prefs/deeper/two.md +1 -0
  104. package/fixtures/cases/typed-path-names-its-type/library/settings/prefs/one.md +4 -0
  105. package/fixtures/cases/typed-path-names-its-type/schema.yaml +6 -0
  106. package/fixtures/cases/typed-path-names-no-type/context.json +11 -0
  107. package/fixtures/cases/typed-path-names-no-type/expected.json +6 -0
  108. package/fixtures/cases/typed-path-names-no-type/library/settings/prefs/one.md +1 -0
  109. package/fixtures/cases/typed-path-names-no-type/schema.yaml +6 -0
  110. package/fixtures/cases/unnamed-typed-path-checks-its-fields/context.json +11 -0
  111. package/fixtures/cases/unnamed-typed-path-checks-its-fields/expected.json +6 -0
  112. package/fixtures/cases/unnamed-typed-path-checks-its-fields/library/rooms/team/tasks/plan.md +4 -0
  113. package/fixtures/cases/unnamed-typed-path-checks-its-fields/schema.yaml +5 -0
  114. package/fixtures/cases/unnamed-typed-path-names-a-type/context.json +11 -0
  115. package/fixtures/cases/unnamed-typed-path-names-a-type/expected.json +6 -0
  116. package/fixtures/cases/unnamed-typed-path-names-a-type/library/rooms/team/tasks/plan.md +6 -0
  117. package/fixtures/cases/unnamed-typed-path-names-a-type/schema.yaml +5 -0
  118. package/fixtures/cases/unnamed-typed-path-reads-its-type/context.json +11 -0
  119. package/fixtures/cases/unnamed-typed-path-reads-its-type/expected.json +3 -0
  120. package/fixtures/cases/unnamed-typed-path-reads-its-type/library/rooms/team/plan.md +1 -0
  121. package/fixtures/cases/unnamed-typed-path-reads-its-type/library/rooms/team/tasks/plan.md +5 -0
  122. package/fixtures/cases/unnamed-typed-path-reads-its-type/schema.yaml +5 -0
  123. package/fixtures/cases/unnamed-typed-path-without-a-body/context.json +11 -0
  124. package/fixtures/cases/unnamed-typed-path-without-a-body/expected.json +5 -0
  125. package/fixtures/cases/unnamed-typed-path-without-a-body/library/rooms/team/tasks/plan.md +5 -0
  126. package/fixtures/cases/unnamed-typed-path-without-a-body/schema.yaml +5 -0
  127. package/fixtures/division.json +26 -26
  128. package/fixtures/queries.json +913 -0
  129. package/package.json +7 -2
@@ -1,4 +1,5 @@
1
1
  import { MEMBER_FIELD, RECEIVED_FIELD, SITE_FIELD, TYPE_FIELD } from './fields.js';
2
+ import { linearPattern } from './pattern.js';
2
3
  import { equalValue, isRecord, jsValue, parseYamlMapping, YamlError } from './yaml.js';
3
4
  export const JSON_TYPES = [
4
5
  'string',
@@ -12,9 +13,25 @@ export const JSON_TYPES = [
12
13
  export const BUILT_IN_TYPE = 'any';
13
14
  export const ATTACHMENT = 'attachment';
14
15
  const SCALAR_TYPES = new Set(['string', 'number', 'integer', 'boolean']);
16
+ const COMPOSITES = ['array', 'object'];
17
+ const ANNOTATIONS = new Set([
18
+ '$comment',
19
+ 'title',
20
+ 'description',
21
+ 'default',
22
+ 'examples',
23
+ 'deprecated',
24
+ 'readOnly',
25
+ 'writeOnly',
26
+ ]);
27
+ const FIELD_RULES = ['change_roles', 'initial_roles', 'transitions'];
28
+ const PROVIDED_KEYWORDS = ['create_roles', 'delete_roles'];
29
+ const NO_TYPES = Object.freeze({ types: Object.freeze({}) });
15
30
  const DEFS_REFERENCE = '#/$defs/';
31
+ const UNBOUNDED_FORMAT = 'url';
16
32
  const UNRESOLVED = /[\u0000-\u001f\u007f%[\]\\^{|}]|\s$/u;
17
33
  export const ARRAY_INDEX = /^(?:0|[1-9][0-9]*)$/u;
34
+ export const JSON_POINTER = /^(?:\/(?:[^~/]|~[01])*)*$/u;
18
35
  const HOUSE_KEYS = {
19
36
  [TYPE_FIELD]: { prose: false },
20
37
  [SITE_FIELD]: { prose: false },
@@ -33,12 +50,12 @@ export function pointerSegments(pointer) {
33
50
  return pointer.split('/').slice(1).map(unescapePointer);
34
51
  }
35
52
  export function refTarget(reference, defs) {
36
- if (!reference.startsWith(DEFS_REFERENCE) || UNRESOLVED.test(reference))
37
- return undefined;
38
- const segments = reference.slice(DEFS_REFERENCE.length).split('/');
39
- const [name = '', ...rest] = segments.map(unescapePointer);
40
- if (segments.some((segment) => escapePointer(unescapePointer(segment)) !== segment))
53
+ const pointer = reference.slice('#'.length);
54
+ if (!reference.startsWith(DEFS_REFERENCE) ||
55
+ UNRESOLVED.test(reference) ||
56
+ !JSON_POINTER.test(pointer))
41
57
  return undefined;
58
+ const [, name = '', ...rest] = pointerSegments(pointer);
42
59
  if (!Object.hasOwn(defs, name))
43
60
  return undefined;
44
61
  let node = defs[name];
@@ -69,15 +86,7 @@ export function refTarget(reference, defs) {
69
86
  return { name, node };
70
87
  }
71
88
  function compiles(pattern) {
72
- if (typeof pattern !== 'string')
73
- return false;
74
- try {
75
- new RegExp(pattern, 'u');
76
- return true;
77
- }
78
- catch {
79
- return false;
80
- }
89
+ return typeof pattern === 'string' && linearPattern(pattern) !== null;
81
90
  }
82
91
  function finite(value) {
83
92
  return typeof value === 'number' && Number.isFinite(value);
@@ -187,7 +196,7 @@ const KEYWORDS = {
187
196
  uniqueItems: FLAG,
188
197
  required: strings,
189
198
  dependentRequired: (value) => isRecord(value) && Object.values(value).every(strings),
190
- format: TEXT,
199
+ format: (value) => typeof value === 'string' && value !== UNBOUNDED_FORMAT,
191
200
  contentEncoding: TEXT,
192
201
  contentMediaType: TEXT,
193
202
  title: TEXT,
@@ -204,8 +213,12 @@ const KEYWORDS = {
204
213
  return (Array.isArray(named) &&
205
214
  named.length > 0 &&
206
215
  strings(named) &&
207
- named.every((name) => name === BUILT_IN_TYPE || name === ATTACHMENT || context.types.has(name)));
216
+ named.every((name) => name === BUILT_IN_TYPE ||
217
+ name === ATTACHMENT ||
218
+ context.types.has(name) ||
219
+ node.cross_room === true));
208
220
  },
221
+ cross_room: (value, _at, node) => typeof value === 'boolean' && node.reference !== undefined,
209
222
  };
210
223
  function sharedType(values) {
211
224
  if (values.length === 0)
@@ -278,6 +291,7 @@ function joined(left, right) {
278
291
  const format = left.format === right.format ? left.format : undefined;
279
292
  const values = united(left.values, right.values);
280
293
  const reference = united(left.reference, right.reference);
294
+ const crossRoom = left.crossRoom === true || right.crossRoom === true;
281
295
  const items = both(left.items, right.items);
282
296
  const prefix = left.prefix === undefined && right.prefix === undefined
283
297
  ? undefined
@@ -298,6 +312,7 @@ function joined(left, right) {
298
312
  ...(format === undefined ? {} : { format }),
299
313
  ...(values === undefined ? {} : { values }),
300
314
  ...(reference === undefined ? {} : { reference }),
315
+ ...(reference !== undefined && crossRoom ? { crossRoom: true } : {}),
301
316
  prose: left.prose && right.prose,
302
317
  ...(prefix === undefined ? {} : { prefix }),
303
318
  ...(items === undefined ? {} : { items }),
@@ -376,6 +391,7 @@ function factsOf(nodes, defs, ancestry) {
376
391
  : Array.isArray(node.reference)
377
392
  ? node.reference
378
393
  : undefined) ?? alternatives.find((facts) => facts.reference !== undefined)?.reference;
394
+ const crossRoom = firstOf(held, (node) => node.reference === undefined ? undefined : node.cross_room === true) ?? alternatives.find((facts) => facts.reference !== undefined)?.crossRoom === true;
379
395
  const format = firstOf(held, (node) => (typeof node.format === 'string' ? node.format : undefined)) ??
380
396
  alternatives.find((facts) => facts.format !== undefined)?.format;
381
397
  const prose = type === 'string' &&
@@ -410,6 +426,7 @@ function factsOf(nodes, defs, ancestry) {
410
426
  ...(format === undefined ? {} : { format }),
411
427
  ...(values === undefined ? {} : { values }),
412
428
  ...(reference === undefined ? {} : { reference }),
429
+ ...(reference !== undefined && crossRoom ? { crossRoom: true } : {}),
413
430
  prose,
414
431
  ...(prefix === undefined ? {} : { prefix }),
415
432
  ...(items === undefined ? {} : { items }),
@@ -427,7 +444,7 @@ export function itemFacts(facts, index) {
427
444
  export function memberFacts(facts, key) {
428
445
  if (facts.properties !== undefined && Object.hasOwn(facts.properties, key))
429
446
  return facts.properties[key];
430
- const pattern = facts.patterns?.find((one) => new RegExp(one.pattern, 'u').test(key));
447
+ const pattern = facts.patterns?.find((one) => linearPattern(one.pattern).test(key));
431
448
  return pattern === undefined ? facts.additional : pattern.facts;
432
449
  }
433
450
  export function crossedFacts(facts) {
@@ -530,6 +547,56 @@ function readSections(value, at, context) {
530
547
  }
531
548
  return { sections };
532
549
  }
550
+ function branchSectionsFailure(sections, declared, where) {
551
+ if (!isRecord(sections))
552
+ return refuse('sections', where);
553
+ for (const [name, spec] of Object.entries(sections)) {
554
+ const place = `${where}/${escapePointer(name)}`;
555
+ const own = isRecord(declared) && Object.hasOwn(declared, name) ? declared[name] : undefined;
556
+ if (!isRecord(spec) || !isRecord(own))
557
+ return refuse('sections', place);
558
+ const { required, ...kind } = spec;
559
+ const { required: _required, ...ownKind } = own;
560
+ if (required !== undefined && typeof required !== 'boolean')
561
+ return refuse('sections', `${place}/required`);
562
+ if (!equalValue(kind, ownKind))
563
+ return refuse('sections', place);
564
+ }
565
+ return undefined;
566
+ }
567
+ function withoutBranchSections(schema, declared, at) {
568
+ const kept = { ...schema };
569
+ if (Array.isArray(schema.allOf)) {
570
+ const entries = [];
571
+ for (const [index, entry] of schema.allOf.entries()) {
572
+ const read = isRecord(entry)
573
+ ? withoutBranchSections(entry, declared, `${at}/allOf/${index}`)
574
+ : { schema: entry };
575
+ if ('failure' in read)
576
+ return read;
577
+ entries.push(read.schema);
578
+ }
579
+ kept.allOf = entries;
580
+ }
581
+ if (schema.if === undefined)
582
+ return { schema: kept };
583
+ for (const branch of ['then', 'else']) {
584
+ const held = schema[branch];
585
+ if (!isRecord(held))
586
+ continue;
587
+ const { sections, ...rest } = held;
588
+ const failure = sections === undefined
589
+ ? undefined
590
+ : branchSectionsFailure(sections, declared, `${at}/${branch}/sections`);
591
+ if (failure !== undefined)
592
+ return { failure };
593
+ const read = withoutBranchSections(rest, declared, `${at}/${branch}`);
594
+ if ('failure' in read)
595
+ return read;
596
+ kept[branch] = read.schema;
597
+ }
598
+ return { schema: kept };
599
+ }
533
600
  function deepFreeze(value) {
534
601
  if (value !== null && typeof value === 'object' && !Object.isFrozen(value)) {
535
602
  Object.freeze(value);
@@ -538,21 +605,157 @@ function deepFreeze(value) {
538
605
  }
539
606
  return value;
540
607
  }
608
+ function ruleValue(value) {
609
+ return value === null || typeof value === 'string' || typeof value === 'boolean' || finite(value);
610
+ }
611
+ function roleNames(value) {
612
+ return strings(value) && value.every((name) => name !== '');
613
+ }
614
+ function compositesOf(value) {
615
+ return Array.isArray(value) ? ['array'] : isRecord(value) ? ['object'] : [];
616
+ }
617
+ function typed(type) {
618
+ const types = typeof type === 'string' ? [type] : type;
619
+ return Array.isArray(types) ? COMPOSITES.filter((kind) => types.includes(kind)) : undefined;
620
+ }
621
+ function admittedWhole(node) {
622
+ if (node === true)
623
+ return COMPOSITES;
624
+ if (!isRecord(node) || Object.keys(node).some((key) => key !== 'type' && !ANNOTATIONS.has(key)))
625
+ return [];
626
+ return typed(node.type) ?? COMPOSITES;
627
+ }
628
+ function composites(node, defs, seen) {
629
+ if (node === false)
630
+ return [];
631
+ if (!isRecord(node))
632
+ return COMPOSITES;
633
+ const each = (nodes) => Array.isArray(nodes) ? nodes.map((one) => composites(one, defs, seen)) : [];
634
+ const target = typeof node.$ref === 'string' ? refTarget(node.$ref, defs)?.node : undefined;
635
+ const conditioned = () => {
636
+ const met = composites(node.then ?? true, defs, seen);
637
+ return COMPOSITES.filter((kind) => (composites(node.if, defs, seen).includes(kind) && met.includes(kind)) ||
638
+ composites(node.else ?? true, defs, seen).includes(kind));
639
+ };
640
+ const bounds = [
641
+ typed(node.type),
642
+ Array.isArray(node.enum) ? node.enum.flatMap(compositesOf) : undefined,
643
+ Object.hasOwn(node, 'const') ? compositesOf(node.const) : undefined,
644
+ target === undefined || seen.has(target)
645
+ ? undefined
646
+ : composites(target, defs, new Set([...seen, target])),
647
+ ...each(node.allOf),
648
+ ...[node.anyOf, node.oneOf].filter(Array.isArray).map((branches) => each(branches).flat()),
649
+ Object.hasOwn(node, 'if') ? conditioned() : undefined,
650
+ Object.hasOwn(node, 'not')
651
+ ? COMPOSITES.filter((kind) => !admittedWhole(node.not).includes(kind))
652
+ : undefined,
653
+ ];
654
+ return COMPOSITES.filter((kind) => bounds.every((bound) => bound?.includes(kind) ?? true));
655
+ }
656
+ function transitionOf(value) {
657
+ if (!isRecord(value) || !Object.hasOwn(value, 'from') || !Object.hasOwn(value, 'to'))
658
+ return undefined;
659
+ const { from, to, roles, ...rest } = value;
660
+ if (Object.keys(rest).length > 0 || !ruleValue(from) || !ruleValue(to))
661
+ return undefined;
662
+ if (roles === undefined)
663
+ return { from, to };
664
+ return roleNames(roles) ? { from, to, roles } : undefined;
665
+ }
666
+ function fieldRules(written, field, at, defs) {
667
+ const { change_roles: changeRoles, initial_roles: initialRoles, transitions } = written;
668
+ if (changeRoles !== undefined && !roleNames(changeRoles))
669
+ return refuse('change_roles', `${at}/change_roles`);
670
+ if (initialRoles !== undefined && !roleNames(initialRoles))
671
+ return refuse('initial_roles', `${at}/initial_roles`);
672
+ if (transitions === undefined)
673
+ return {
674
+ ...(changeRoles === undefined ? {} : { changeRoles }),
675
+ ...(initialRoles === undefined ? {} : { initialRoles }),
676
+ };
677
+ if (!Array.isArray(transitions) || composites(field, defs, new Set()).length > 0)
678
+ return refuse('transitions', `${at}/transitions`);
679
+ const listed = [];
680
+ for (const [index, held] of transitions.entries()) {
681
+ const transition = transitionOf(held);
682
+ if (transition === undefined)
683
+ return refuse('transitions', `${at}/transitions/${index}`);
684
+ listed.push(transition);
685
+ }
686
+ return {
687
+ ...(changeRoles === undefined ? {} : { changeRoles }),
688
+ ...(initialRoles === undefined ? {} : { initialRoles }),
689
+ transitions: listed,
690
+ };
691
+ }
692
+ function unruled(schema) {
693
+ const written = new Map();
694
+ if (!isRecord(schema.properties))
695
+ return { schema, written };
696
+ const properties = Object.create(null);
697
+ for (const [field, node] of Object.entries(schema.properties)) {
698
+ if (!isRecord(node) || !FIELD_RULES.some((keyword) => Object.hasOwn(node, keyword))) {
699
+ properties[field] = node;
700
+ continue;
701
+ }
702
+ written.set(field, node);
703
+ properties[field] = Object.fromEntries(Object.entries(node).filter(([keyword]) => !FIELD_RULES.includes(keyword)));
704
+ }
705
+ return { schema: written.size === 0 ? schema : { ...schema, properties }, written };
706
+ }
707
+ function providedType(name, value, provided) {
708
+ const at = `/${escapePointer(name)}`;
709
+ if (provided.nameable?.includes(name) !== true)
710
+ return refuse('provided-type', at);
711
+ if (!isRecord(value))
712
+ return refuse('schema', at);
713
+ const declared = Object.keys(value).find((key) => !PROVIDED_KEYWORDS.includes(key));
714
+ if (declared !== undefined)
715
+ return refuse('provided-type', `${at}/${escapePointer(declared)}`);
716
+ const { create_roles: createRoles, delete_roles: deleteRoles } = value;
717
+ if (createRoles !== undefined && !roleNames(createRoles))
718
+ return refuse('create_roles', `${at}/create_roles`);
719
+ if (deleteRoles !== undefined && !roleNames(deleteRoles))
720
+ return refuse('delete_roles', `${at}/delete_roles`);
721
+ return {
722
+ ...provided.types[name],
723
+ ...(createRoles === undefined ? {} : { createRoles }),
724
+ ...(deleteRoles === undefined ? {} : { deleteRoles }),
725
+ };
726
+ }
541
727
  function readType(name, value, context) {
542
728
  const at = `/${escapePointer(name)}`;
543
729
  if (!isRecord(value))
544
730
  return refuse('schema', at);
545
- const { sections: declared, member_document: mark, ...schema } = value;
731
+ const { sections: declared, member_document: mark, create_roles: createRoles, delete_roles: deleteRoles, ...ruled } = value;
546
732
  if (mark !== undefined && typeof mark !== 'boolean')
547
733
  return refuse('member_document', `${at}/member_document`);
734
+ if (createRoles !== undefined && !roleNames(createRoles))
735
+ return refuse('create_roles', `${at}/create_roles`);
736
+ if (deleteRoles !== undefined && !roleNames(deleteRoles))
737
+ return refuse('delete_roles', `${at}/delete_roles`);
548
738
  const read = declared === undefined
549
739
  ? { sections: Object.create(null) }
550
740
  : readSections(declared, `${at}/sections`, context);
551
741
  if ('failure' in read)
552
742
  return read.failure;
743
+ const unbranched = withoutBranchSections(ruled, declared, at);
744
+ if ('failure' in unbranched)
745
+ return unbranched.failure;
746
+ const { schema, written } = unruled(unbranched.schema);
553
747
  const failure = schemaFailure(schema, at, context);
554
748
  if (failure !== undefined)
555
749
  return failure;
750
+ const rules = Object.create(null);
751
+ for (const [field, keywords] of written) {
752
+ const properties = schema.properties;
753
+ const where = `${at}/properties/${escapePointer(field)}`;
754
+ const ruling = fieldRules(keywords, properties[field], where, context.defs);
755
+ if ('rule' in ruling)
756
+ return ruling;
757
+ rules[field] = ruling;
758
+ }
556
759
  const memberDocument = mark === true;
557
760
  const root = valueFacts(schema, context.defs);
558
761
  const fields = Object.assign(Object.create(null), root.properties);
@@ -560,19 +763,26 @@ function readType(name, value, context) {
560
763
  fields[MEMBER_FIELD] = { type: 'string', prose: false };
561
764
  const defs = Object.create(null);
562
765
  reachedDefs(value, context.defs, defs);
766
+ const { create_roles: _create, delete_roles: _delete, ...shaped } = value;
563
767
  return {
564
768
  name,
565
769
  memberDocument,
566
770
  frontmatter: { ...root, properties: { ...HOUSE_KEYS, ...fields } },
567
771
  fields,
568
772
  sections: read.sections,
569
- shape: { schema: value, defs },
773
+ rules,
774
+ ...(createRoles === undefined ? {} : { createRoles }),
775
+ ...(deleteRoles === undefined ? {} : { deleteRoles }),
776
+ shape: {
777
+ schema: written.size === 0 ? shaped : { ...shaped, properties: schema.properties },
778
+ defs,
779
+ },
570
780
  };
571
781
  }
572
782
  function lineAt(text, offset) {
573
783
  return text.slice(0, offset).split(/\r\n|\r|\n/).length;
574
784
  }
575
- export function readSchema(text) {
785
+ export function readSchema(text, provided = NO_TYPES) {
576
786
  let root;
577
787
  try {
578
788
  root = jsValue(parseYamlMapping(text, 0, text.length));
@@ -590,7 +800,7 @@ export function readSchema(text) {
590
800
  if (name === '' || name.startsWith('$') || name === BUILT_IN_TYPE || name === ATTACHMENT)
591
801
  return refuse('schema-type-name', `/${escapePointer(name)}`);
592
802
  }
593
- const context = { defs, types: new Set(names) };
803
+ const context = { defs, types: new Set([...names, ...Object.keys(provided.types)]) };
594
804
  for (const [name, def] of Object.entries(defs)) {
595
805
  const failure = schemaFailure(def, `/$defs/${escapePointer(name)}`, context);
596
806
  if (failure !== undefined)
@@ -599,7 +809,9 @@ export function readSchema(text) {
599
809
  const types = Object.create(null);
600
810
  let marked = false;
601
811
  for (const name of names) {
602
- const definition = readType(name, root[name], context);
812
+ const definition = Object.hasOwn(provided.types, name)
813
+ ? providedType(name, root[name], provided)
814
+ : readType(name, root[name], context);
603
815
  if ('rule' in definition)
604
816
  return definition;
605
817
  if (definition.memberDocument) {
@@ -609,5 +821,9 @@ export function readSchema(text) {
609
821
  }
610
822
  types[name] = deepFreeze(definition);
611
823
  }
824
+ for (const [name, definition] of Object.entries(provided.types)) {
825
+ if (!Object.hasOwn(types, name))
826
+ types[name] = definition;
827
+ }
612
828
  return Object.freeze({ types: Object.freeze(types) });
613
829
  }
@@ -1 +1 @@
1
- {"version":3,"file":"divide.d.ts","sourceRoot":"","sources":["../src/divide.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,eAAe,EAAE,QAAQ,EAAgB,MAAM,YAAY,CAAC;AA4WpF,wBAAgB,MAAM,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,GAAG,QAAQ,CAc3F"}
1
+ {"version":3,"file":"divide.d.ts","sourceRoot":"","sources":["../src/divide.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,QAAQ,EAAE,eAAe,EAAE,QAAQ,EAAgB,MAAM,YAAY,CAAC;AAwXpF,wBAAgB,MAAM,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,GAAG,QAAQ,CAc3F"}
package/dist/divide.js CHANGED
@@ -1,7 +1,7 @@
1
1
  import { blockRanges, headingLines } from './blocks.js';
2
- import { projectionInput, rangeText } from './project.js';
2
+ import { firstEditFrom, projectionInput, rangeText, } from './project.js';
3
3
  import { refusal } from './refuse.js';
4
- const SMALLEST_BUDGET = 2;
4
+ const SMALLEST_BOUND = 2;
5
5
  function node(draft) {
6
6
  return {
7
7
  start: draft.start,
@@ -86,8 +86,8 @@ function isTrailingSurrogate(text, index) {
86
86
  function characterLength(text, index) {
87
87
  return isTrailingSurrogate(text, index + 1) ? 2 : 1;
88
88
  }
89
- function boundOf(cutting, from, to, budget) {
90
- const limit = from + budget;
89
+ function boundOf(cutting, from, to, bound) {
90
+ const limit = from + bound;
91
91
  if (limit >= to)
92
92
  return to;
93
93
  for (let index = limit; index > from + 1; index -= 1) {
@@ -131,16 +131,26 @@ function textOf(state, extent) {
131
131
  return rangeText(state.content, extent, state.edits);
132
132
  }
133
133
  function sourceCutting(state, extent) {
134
- let text = state.content.slice(extent.start, extent.end);
134
+ const source = state.content.slice(extent.start, extent.end);
135
135
  const masks = [];
136
- for (const edit of state.edits) {
137
- if (edit.start < extent.start || edit.end > extent.end)
136
+ for (let index = firstEditFrom(state.edits, extent.start); index < state.edits.length; index += 1) {
137
+ const edit = state.edits[index];
138
+ if (edit.start > extent.end)
139
+ break;
140
+ if (edit.end > extent.end)
138
141
  continue;
139
- const from = edit.start - extent.start;
140
- const to = edit.end - extent.start;
141
- text = `${text.slice(0, from)}${'x'.repeat(to - from)}${text.slice(to)}`;
142
- masks.push({ start: from, end: to });
142
+ masks.push({ start: edit.start - extent.start, end: edit.end - extent.start });
143
143
  }
144
+ let text = '';
145
+ let cursor = 0;
146
+ for (const mask of masks) {
147
+ if (mask.end <= cursor)
148
+ continue;
149
+ const from = Math.max(mask.start, cursor);
150
+ text += `${source.slice(cursor, from)}${'x'.repeat(mask.end - from)}`;
151
+ cursor = mask.end;
152
+ }
153
+ text += source.slice(cursor);
144
154
  return {
145
155
  text,
146
156
  masks,
@@ -158,12 +168,12 @@ function valueCutting(value) {
158
168
  };
159
169
  }
160
170
  function prefixOf(state, body) {
161
- if (body.emitted === 0 || body.heading.length >= state.budget)
171
+ if (body.emitted === 0 || body.heading.length >= state.bound)
162
172
  return '';
163
173
  return body.heading;
164
174
  }
165
175
  function available(state, body) {
166
- return state.budget - prefixOf(state, body).length;
176
+ return state.bound - prefixOf(state, body).length;
167
177
  }
168
178
  function emit(state, body, piece, bare = false) {
169
179
  if (piece.text.trim() === '')
@@ -206,7 +216,7 @@ function divideBound(state, body, cutting, range) {
206
216
  let start = range.start;
207
217
  while (start < range.end) {
208
218
  const bare = available(state, body) < characterLength(cutting.text, start);
209
- const room = bare ? state.budget : available(state, body);
219
+ const room = bare ? state.bound : available(state, body);
210
220
  const stop = boundOf(cutting, start, range.end, room);
211
221
  const piece = cutting.piece(start, stop);
212
222
  if (cutting.masks.length === 0 || piece.text.length <= room) {
@@ -293,8 +303,8 @@ function divideInput(state, input) {
293
303
  ]);
294
304
  }
295
305
  export function divide(document, file, context) {
296
- if (!Number.isInteger(context.budget) || context.budget < SMALLEST_BUDGET) {
297
- return { ok: false, refusal: refusal(file, 'division-budget') };
306
+ if (!Number.isInteger(context.bound) || context.bound < SMALLEST_BOUND) {
307
+ return { ok: false, refusal: refusal(file, 'division-bound') };
298
308
  }
299
309
  const result = projectionInput(document, file, context);
300
310
  if (!result.ok)
@@ -302,7 +312,7 @@ export function divide(document, file, context) {
302
312
  const state = {
303
313
  content: document.content,
304
314
  edits: result.input.edits,
305
- budget: context.budget,
315
+ bound: context.bound,
306
316
  spans: [],
307
317
  };
308
318
  divideInput(state, result.input);
@@ -1,16 +1,16 @@
1
1
  import { type Definition } from './definition.js';
2
- import type { ApplyResult, BodyResult, FrontmatterResult, Change, Document, Link, LinkOccurrence, ParseResult } from './types.js';
2
+ import { type LinkInventory } from './links.js';
3
+ import type { ApplyResult, BodyResult, FrontmatterResult, Change, Document, Link, ParseResult } from './types.js';
3
4
  import { type YamlMap } from './yaml.js';
5
+ export declare function inventoryOf(document: Document): LinkInventory;
4
6
  export declare function parseFrontmatter(content: string, file?: string): FrontmatterResult;
5
7
  export declare function parse(content: string, file?: string): ParseResult;
6
- export declare function relativize(document: Document, file: string, handle: string, definition?: Definition): ApplyResult;
8
+ export declare function relativize(document: Document, file: string, handle: string, definition?: Definition, kept?: ReadonlySet<string>): ApplyResult;
7
9
  export declare function relativizeBody(body: string, file: string, handle: string): BodyResult;
8
10
  export declare function relinkBody(body: string, file: string, moves: ReadonlyMap<string, string>): BodyResult;
9
11
  export declare function links(document: Document, file: string): readonly Link[];
10
- export declare function linkOccurrences(document: Document, file: string): readonly LinkOccurrence[];
11
12
  export declare function bodyLinks(body: string, file: string): readonly Link[];
12
- export declare function apply(document: Document, change: Change): ApplyResult;
13
+ export declare function apply(document: Document, changes: readonly Change[]): ApplyResult;
13
14
  export declare function serialize(document: Document): string;
14
- export declare function fieldStart(document: Document, pointer: string): number | undefined;
15
15
  export declare function frontmatter(document: Document): YamlMap | null;
16
16
  //# sourceMappingURL=document.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"document.d.ts","sourceRoot":"","sources":["../src/document.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgC,KAAK,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAMhF,OAAO,KAAK,EACV,WAAW,EACX,UAAU,EACV,iBAAiB,EACjB,MAAM,EACN,QAAQ,EACR,IAAI,EACJ,cAAc,EACd,WAAW,EAEZ,MAAM,YAAY,CAAC;AACpB,OAAO,EAaL,KAAK,OAAO,EAEb,MAAM,WAAW,CAAC;AAmEnB,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,SAAK,GAAG,iBAAiB,CAW9E;AAED,wBAAgB,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,SAAK,GAAG,WAAW,CAgB7D;AAqMD,wBAAgB,UAAU,CACxB,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,UAAU,CAAC,EAAE,UAAU,GACtB,WAAW,CAYb;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,UAAU,CASrF;AAED,wBAAgB,UAAU,CACxB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,GACjC,UAAU,CAeZ;AAuBD,wBAAgB,KAAK,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS,IAAI,EAAE,CAEvE;AAED,wBAAgB,eAAe,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS,cAAc,EAAE,CAG3F;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS,IAAI,EAAE,CAErE;AAED,wBAAgB,KAAK,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,WAAW,CAOrE;AAED,wBAAgB,SAAS,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM,CAEpD;AAED,wBAAgB,UAAU,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAGlF;AAED,wBAAgB,WAAW,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,GAAG,IAAI,CAE9D"}
1
+ {"version":3,"file":"document.d.ts","sourceRoot":"","sources":["../src/document.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgC,KAAK,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAChF,OAAO,EAKL,KAAK,aAAa,EACnB,MAAM,YAAY,CAAC;AAcpB,OAAO,KAAK,EACV,WAAW,EACX,UAAU,EACV,iBAAiB,EACjB,MAAM,EACN,QAAQ,EACR,IAAI,EACJ,WAAW,EAEZ,MAAM,YAAY,CAAC;AACpB,OAAO,EAcL,KAAK,OAAO,EAEb,MAAM,WAAW,CAAC;AAgBnB,wBAAgB,WAAW,CAAC,QAAQ,EAAE,QAAQ,GAAG,aAAa,CAM7D;AAgED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,SAAK,GAAG,iBAAiB,CAW9E;AAED,wBAAgB,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,SAAK,GAAG,WAAW,CAgB7D;AAmED,wBAAgB,UAAU,CACxB,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,UAAU,CAAC,EAAE,UAAU,EACvB,IAAI,GAAE,WAAW,CAAC,MAAM,CAAa,GACpC,WAAW,CAuBb;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,UAAU,CAUrF;AAED,wBAAgB,UAAU,CACxB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,GACjC,UAAU,CAkBZ;AAeD,wBAAgB,KAAK,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS,IAAI,EAAE,CAEvE;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS,IAAI,EAAE,CAErE;AA4LD,wBAAgB,KAAK,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,MAAM,EAAE,GAAG,WAAW,CA4CjF;AAED,wBAAgB,SAAS,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM,CAEpD;AAED,wBAAgB,WAAW,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,GAAG,IAAI,CAE9D"}