@tricoteuses/tisseuse 0.14.18 → 0.15.0

package/dist/src/lib/extractors/action_directives.d.ts

@@ -38,6 +38,7 @@ export type ActionOperation = (ActionOperationTarget & {
     targetText: string;
     insertText: string;
     insertLayout?: ActionInsertLayout;
+    occurrenceIndex?: number;
     citation?: ActionCitation;
     tableTarget?: ActionTableTarget;
 }) | (ActionOperationTarget & {
@@ -77,6 +78,7 @@ export type ResolvedActionDirective = (ActionDirectiveCommon & {
     targetText: string;
     insertText: string;
     insertLayout?: ActionInsertLayout;
+    occurrenceIndex?: number;
     citation?: ActionCitation;
     tableTarget?: ActionTableTarget;
 }) | (ActionDirectiveCommon & {

package/dist/src/lib/extractors/article_action_effects.d.ts

@@ -0,0 +1,17 @@
+import { ResolvedActionDirective } from './action_directives.js';
+import { FragmentPosition } from '../text_parsers/fragments.js';
+export type ArticleActionSourceAnnotation = {
+    /** Offsets in the original block text, before parser simplification. */
+    sourceText: string;
+    referencePosition: FragmentPosition;
+    actionPosition: FragmentPosition;
+};
+export type ArticleActionEffect = {
+    targetId: string;
+    directive: ResolvedActionDirective;
+    sourceAnnotation: ArticleActionSourceAnnotation;
+};
+/** Source ranges for distinct operations on the same article, from the grammar. */
+export declare function extractActionOperationSourceAnnotations(sourceText: string, operationCount: number): ArticleActionSourceAnnotation[] | null;
+/** Resolve linked article targets only when the grammar accounts for every link. */
+export declare function extractArticleActionEffects(sourceText: string, targetIds: string[]): ArticleActionEffect[] | null;

package/dist/src/lib/extractors/article_action_effects.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/src/lib/extractors/article_action_effects_long.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/src/lib/extractors/article_action_targets.d.ts

@@ -0,0 +1,11 @@
+import { TextAstArticle, TextAstReference } from '../text_parsers/ast.js';
+export type ArticleActionTarget = {
+    article: TextAstArticle;
+    reference: TextAstReference;
+};
+/**
+ * Split a parsed reference at article boundaries, keeping the portion tree
+ * attached to each article. A portion enumeration *inside* an article is
+ * deliberately kept together: it describes several edits to one article.
+ */
+export declare function extractArticleActionTargets(reference: TextAstReference): ArticleActionTarget[];

package/dist/src/lib/extractors/article_action_targets.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/src/lib/extractors/quoted_text.d.ts

@@ -1,5 +1,7 @@
+import { FrenchCitationParseOptions } from '../text_parsers/citations.js';
 import { FragmentPosition } from '../text_parsers/fragments.js';
 export type QuotedTextInfo = {
+    closed?: boolean;
     text: string;
     start: number;
     end: number;
@@ -9,7 +11,7 @@ export type QuoteRange = {
     end: number;
 };
 export declare function normalizeQuotedText(text: string): string;
-export declare function extractQuotedTextInfos(text: string): QuotedTextInfo[];
+export declare function extractQuotedTextInfos(text: string, options?: FrenchCitationParseOptions): QuotedTextInfo[];
 export declare function stripQuotedTextSegments(text: string, quotedInfos: Pick<QuotedTextInfo, "start" | "end">[]): string;
 export declare function getQuoteRanges(text: string): QuoteRange[];
 export declare function isInsideRanges(position: FragmentPosition | undefined, ranges: Array<{

package/dist/src/lib/index.d.ts

@@ -26,7 +26,7 @@ export { action } from './text_parsers/actions.js';
 export { actionDirective } from './text_parsers/action_directives.js';
 export { article, articles, definitionArticleDansCitation, definitionArticleDansProjetOuPropositionLoi, designationArticle, extractArticleDefinitionsFromCitation, listeArticles, nomArticle, normalizeBillArticleNumber, parseArticleNumber, parseBillArticleLabel, type ArticleDefinitionInCitation, nomSpecialArticle, type BillArticleLabel, } from './text_parsers/articles.js';
 export { actionTargets, compoundReferencesSeparators, divisionTypes, europeanLawNatures, frenchLawNatures, internationalLawNatures, isTextAstAtomicReference, isTextAstDivision, isTextAstPortion, lawNatures, localizationAdverbs, portionTypes, type ActionTarget, type CompoundReferencesSeparator, type DivisionType, type EuropeanLawNature, type FrenchLawNature, type InternationalLawNature, type LawNature, type LocalizationAdverb, type PortionType, type TextAst, type TextAstAction, type TextAstActionDirective, type TextAstActionDirectiveOperation, type TextAstActionTargetScope, type TextAstApplicabilityClause, type TextAstArticle, type TextAstAtomicReference, type TextAstBoundedInterval, type TextAstCitation, type TextAstCompoundReference, type TextAstConseilConstitutionnelDecision, type TextAstCountedInterval, type TextAstDivision, type TextAstEnumeration, type TextAstExclusion, type TextAstIncompleteHeader, type TextAstLocalization, type TextAstModificationBlock, type TextAstModificationItem, type TextAstNumber, type TextAstParentChild, type TextAstPortion, type TextAstPosition, type TextAstReference, type TextAstReferenceAndAction, type TextAstText, type TextAstTextIdentification, type TextAstTextInfos, type TextInfosByWordsTree, type TextInfosByWordsTreeNode, } from './text_parsers/ast.js';
-export { citation, citationToText, citationLigne, citationSimple, } from './text_parsers/citations.js';
+export { citation, citationToText, citationLigne, citationSimple, extractFrenchCitations, parseFrenchCitationAt, type FrenchCitationParseOptions, type ParsedFrenchCitation, } from './text_parsers/citations.js';
 export { date, duDate } from './text_parsers/dates.js';
 export { referenceDoctrinale, referenceDoctrinaleArticleAvantSource, referenceDoctrinaleArticlesAvantSource, referenceDoctrinaleSourceAvantArticle, } from './text_parsers/doctrinal_references.js';
 export { definitionDivision, designationDivision, division, divisions, natureDivisionSingulier, numeroDivision, } from './text_parsers/divisions.js';

package/dist/src/lib/server/parsed_bills.d.ts

@@ -1,13 +1,15 @@
 import { Sql } from 'postgres';
 import { ResolvedActionDirective } from '../extractors/action_directives.js';
+import { ArticleActionEffect, ArticleActionSourceAnnotation } from '../extractors/article_action_effects.js';
 import { TableOfContents } from '../extractors/table_of_contents.js';
 import { LegiResolver } from '../legi/resolver.js';
 import { LinkType } from '../links.js';
 export type ParsedBillSourceFormat = "assemblee-html" | "akoma-ntoso";
 export type ParsedBillBlockKind = "directive_candidate" | "context" | "noise";
 export type ParsedBillToc = TableOfContents;
+export type ParsedBillDiagnosticCode = "nested_french_quote_in_redaction" | "assemblee_toc_article_order_mismatch" | "article_toc_number_gap" | "article_toc_out_of_order" | "article_toc_duplicate_number" | "article_toc_missing_anchor" | "article_toc_source_heading_mismatch";
 export type ParsedBillDiagnostic = {
-    code: string;
+    code: ParsedBillDiagnosticCode;
     message: string;
     details?: unknown;
 };
@@ -66,6 +68,10 @@ export type ParsedBillDirective = {
         stop: number;
     };
     directive: ResolvedActionDirective;
+    /** Per-article effects when the source modifies several linked articles. */
+    effects?: ArticleActionEffect[];
+    /** Grammar positions of separate operations modifying the same article. */
+    sourceAnnotations?: ArticleActionSourceAnnotation[];
     createdArticle?: ParsedBillInternalArticleTarget;
     createdArticles?: ParsedBillInternalArticleTarget[];
     internalTarget?: ParsedBillInternalArticleTarget & {

package/dist/src/lib/text_parsers/articles.d.ts

@@ -47,8 +47,10 @@ export declare const nomArticleDefinition: import('./parsers.js').TextParser<imp
  *
  * Dans un projet (ou une proposition) de loi initial, un numéro d'article
  * est un simple nombre ou un nom spécial.
- * Dans les versions suivantes, le numéro d'article est un nombre éventuellement
- * suivi d'un adverbe multiplicatif latin.
+ * Dans les versions suivantes, le numéro d'article peut aussi être suivi
+ * d'une lettre (article 1 A) ou d'un adverbe latin et de lettres (3 bis AA).
+ * Cette règle reste distincte de nomArticle : les références aux articles
+ * de codes peuvent avoir un préfixe et des séparateurs absents des PJL/PPL.
  */
 export declare const nomArticleProjetOuPropositionLoi: import('./parsers.js').TextParser<import('./ast.js').TextAst>;
 /**

package/dist/src/lib/text_parsers/citations.d.ts

@@ -1,11 +1,28 @@
-import { TextAst, TextAstCitation } from './ast.js';
+import { TextAstCitation } from './ast.js';
 import { TextParserContext, TextParser } from './parsers.js';
 import { TransformationLeaf } from './transformers.js';
 type TextAstPositionRange = TextAstCitation["position"];
 export declare function createTextAstCitation(contentPosition: TextAstPositionRange, position?: TextAstPositionRange): TextAstCitation;
-export declare const citationLigne: TextParser<TextAst>;
-export declare const citationSimple: TextParser<TextAst>;
-export declare const citation: TextParser<TextAst>;
+export type FrenchCitationParseOptions = {
+    allowClosingQuoteAsOpening?: boolean;
+    allowUnclosed?: boolean;
+};
+export type ParsedFrenchCitation = {
+    closed: boolean;
+    content: Array<{
+        start: number;
+        stop: number;
+    }>;
+    position: {
+        start: number;
+        stop: number;
+    };
+};
+export declare const citationLigne: TextParser<import('./ast.js').TextAst>;
+export declare const citationSimple: TextParser<import('./ast.js').TextAst>;
+export declare function parseFrenchCitationAt(input: string, start: number, { allowClosingQuoteAsOpening, allowUnclosed, }?: FrenchCitationParseOptions): ParsedFrenchCitation | undefined;
+export declare function extractFrenchCitations(input: string, options?: FrenchCitationParseOptions): ParsedFrenchCitation[];
+export declare const citation: TextParser<TextAstCitation>;
 export declare function convertCitationToText(context: TextParserContext, citation: TextAstCitation): TransformationLeaf;
 export declare function citationToText(sourceText: string, citation: TextAstCitation): string;
 export {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tricoteuses/tisseuse",
   "description": "Find links in/to French legislative documents",
-  "version": "0.14.18",
+  "version": "0.15.0",
   "keywords": [
     "Assemblée nationale",
     "France",