@tricoteuses/senat 3.0.0 → 3.0.2

package/lib/src/scripts/convert_data.js

@@ -2,16 +2,16 @@ import commandLineArgs from "command-line-args";
 import fs from "fs-extra";
 import path from "path";
 import pLimit from "p-limit";
-import * as git from "../git";
-import { datasets, EnabledDatasets, getEnabledDatasets } from "../datasets";
-import { DATA_ORIGINAL_FOLDER, DATA_TRANSFORMED_FOLDER, DOCUMENT_METADATA_FILE, DOSLEG_DOSSIERS_FOLDER, SCRUTINS_FOLDER, RAPPORT_FOLDER, SENS_CIRCONSCRIPTIONS_FOLDER, SENS_ORGANISMES_FOLDER, SENS_SENATEURS_FOLDER, TEXTE_FOLDER, ENRICHED_TEXTE_FOLDER, } from "../loaders";
-import { findAllAmendements, findAllCirconscriptions, findAllDebats, findAllDossiers, findAllScrutins, findAllOrganismes, findAllQuestions, findAllSens, findAllTextes, findAllRapports, } from "../model";
-import { processRapport, processTexte } from "./retrieve_documents";
-import { buildActesLegislatifs } from "../model/dosleg";
-import { UNDEFINED_SESSION } from "../types/sessions";
-import { getSessionFromDate, getSessionFromSignet } from "./datautil";
-import { assertExistingDirectory, commonOptions } from "./shared/cli_helpers";
-import { ensureAndClearDir } from "./shared/util";
+import * as git from "../git.js";
+import { datasets, EnabledDatasets, getEnabledDatasets } from "../datasets.js";
+import { DATA_ORIGINAL_FOLDER, DATA_TRANSFORMED_FOLDER, DOCUMENT_METADATA_FILE, DOSLEG_DOSSIERS_FOLDER, SCRUTINS_FOLDER, RAPPORT_FOLDER, SENS_CIRCONSCRIPTIONS_FOLDER, SENS_ORGANISMES_FOLDER, SENS_SENATEURS_FOLDER, TEXTE_FOLDER, ENRICHED_TEXTE_FOLDER, } from "../loaders.js";
+import { findAllAmendements, findAllCirconscriptions, findAllDebats, findAllDossiers, findAllScrutins, findAllOrganismes, findAllQuestions, findAllSens, findAllTextes, findAllRapports, } from "../model/index.js";
+import { processRapport, processTexte } from "./retrieve_documents.js";
+import { buildActesLegislatifs } from "../model/dosleg.js";
+import { UNDEFINED_SESSION } from "../types/sessions.js";
+import { getSessionFromDate, getSessionFromSignet } from "./datautil.js";
+import { assertExistingDirectory, commonOptions } from "./shared/cli_helpers.js";
+import { ensureAndClearDir } from "./shared/util.js";
 let exitCode = 10; // 0: some data changed, 10: no modification
 const optionsDefinitions = [...commonOptions];
 const options = commandLineArgs(optionsDefinitions);

package/lib/src/scripts/convert_xml_to_html.js

@@ -1,7 +1,7 @@
 import fs from "fs-extra";
 import path from "path";
 import commandLineArgs from "command-line-args";
-import { convertSenatXmlToHtml } from "../conversion_textes";
+import { convertSenatXmlToHtml } from "../conversion_textes.js";
 const optionDefinitions = [
     { name: "input", alias: "i", type: String, defaultOption: true },
     { name: "output", alias: "o", type: String },

package/lib/src/scripts/datautil.d.ts

@@ -1,4 +1,4 @@
-import { Session } from "../types/sessions";
+import { Session } from "../types/sessions.js";
 export declare const STANDARD_DATE_FORMAT = "yyyy-MM-dd";
 export declare const ID_DATE_FORMAT = "yyyyMMdd";
 export declare const AKN_IDENTIFICATION_STRUCTURE_REGEXP: RegExp;

package/lib/src/scripts/retrieve_agenda.js

@@ -2,15 +2,15 @@ import commandLineArgs from "command-line-args";
 import fs from "fs-extra";
 import { DateTime } from "luxon";
 import path from "path";
-import * as git from "../git";
-import { AGENDA_FOLDER, DATA_ORIGINAL_FOLDER, DATA_TRANSFORMED_FOLDER } from "../loaders";
-import { parseAgendaFromFile } from "../model/agenda";
-import { getSessionsFromStart, UNDEFINED_SESSION } from "../types/sessions";
-import { ID_DATE_FORMAT } from "./datautil";
-import { assertExistingDirectory, commonOptions } from "./shared/cli_helpers";
-import { fetchWithRetry } from "./shared/util";
-import { buildReunionsByBucket } from "../utils/reunion_parsing";
-import { buildSenatDossierIndex } from "../utils/reunion_odj_building";
+import * as git from "../git.js";
+import { AGENDA_FOLDER, DATA_ORIGINAL_FOLDER, DATA_TRANSFORMED_FOLDER } from "../loaders.js";
+import { parseAgendaFromFile } from "../model/agenda.js";
+import { getSessionsFromStart, UNDEFINED_SESSION } from "../types/sessions.js";
+import { ID_DATE_FORMAT } from "./datautil.js";
+import { assertExistingDirectory, commonOptions } from "./shared/cli_helpers.js";
+import { fetchWithRetry } from "./shared/util.js";
+import { buildReunionsByBucket } from "../utils/reunion_parsing.js";
+import { buildSenatDossierIndex } from "../utils/reunion_odj_building.js";
 const optionsDefinitions = [
     ...commonOptions,
     {

package/lib/src/scripts/retrieve_cr_commission.js

@@ -1,15 +1,15 @@
 import fs, { ensureDir } from "fs-extra";
 import path from "path";
 import * as cheerio from "cheerio";
-import { COMMISSION_FOLDER, DATA_ORIGINAL_FOLDER, DATA_TRANSFORMED_FOLDER } from "../loaders";
-import { loadAgendaForDate, parseCommissionMetadataFromHtml, linkCRtoCommissionGroup } from "../utils/cr_spliting";
-import { cleanTitle, extractDayH3Sections, parseCommissionCRSectionFromDom } from "../model/commission";
+import { COMMISSION_FOLDER, DATA_ORIGINAL_FOLDER, DATA_TRANSFORMED_FOLDER } from "../loaders.js";
+import { loadAgendaForDate, parseCommissionMetadataFromHtml, linkCRtoCommissionGroup } from "../utils/cr_spliting.js";
+import { cleanTitle, extractDayH3Sections, parseCommissionCRSectionFromDom } from "../model/commission.js";
 import commandLineArgs from "command-line-args";
-import { assertExistingDirectory, commonOptions } from "./shared/cli_helpers";
-import { sessionStartYearFromDate } from "../model/seance";
-import { getSessionsFromStart, UNDEFINED_SESSION } from "../types/sessions";
-import { ensureAndClearDir, fetchWithRetry } from "./shared/util";
-import { jaccard, jaccardTokenSim } from "../utils/scoring";
+import { assertExistingDirectory, commonOptions } from "./shared/cli_helpers.js";
+import { sessionStartYearFromDate } from "../model/seance.js";
+import { getSessionsFromStart, UNDEFINED_SESSION } from "../types/sessions.js";
+import { ensureAndClearDir, fetchWithRetry } from "./shared/util.js";
+import { jaccard, jaccardTokenSim } from "../utils/scoring.js";
 import * as git from "../git.js";
 class CommissionCRDownloadError extends Error {
     constructor(message, url) {

package/lib/src/scripts/retrieve_cr_seance.d.ts

@@ -3,7 +3,7 @@
  * - downloads the ZIP of comptes-rendus des débats (CRI) from data.senat.fr
  * - extracts XML files, distributes them by session/year
  */
-import { Session } from "../types/sessions";
+import { Session } from "../types/sessions.js";
 import { CommandLineOptions } from "command-line-args";
 type RetrieveCriOptions = CommandLineOptions & {
     commit?: boolean;

package/lib/src/scripts/retrieve_cr_seance.js

@@ -8,14 +8,14 @@ import fs, { ensureDirSync } from "fs-extra";
 import path from "path";
 import StreamZip from "node-stream-zip";
 import * as cheerio from "cheerio";
-import { AGENDA_FOLDER, COMPTES_RENDUS_FOLDER, DATA_ORIGINAL_FOLDER, DATA_TRANSFORMED_FOLDER } from "../loaders";
-import { assertExistingDirectory, commonOptions } from "./shared/cli_helpers";
-import { parseCompteRenduIntervalFromFile, sessionStartYearFromDate } from "../model/seance";
-import { extractSommaireBlocks, makeReunionUid } from "../utils/reunion_parsing";
-import { getSessionsFromStart, UNDEFINED_SESSION } from "../types/sessions";
-import { ensureAndClearDir, fetchWithRetry } from "./shared/util";
-import { isNoiseBlock, scoreSommaireBlockForEvent } from "../utils/scoring";
-import { parseYYYYMMDD } from "../utils/date";
+import { AGENDA_FOLDER, COMPTES_RENDUS_FOLDER, DATA_ORIGINAL_FOLDER, DATA_TRANSFORMED_FOLDER } from "../loaders.js";
+import { assertExistingDirectory, commonOptions } from "./shared/cli_helpers.js";
+import { parseCompteRenduIntervalFromFile, sessionStartYearFromDate } from "../model/seance.js";
+import { extractSommaireBlocks, makeReunionUid } from "../utils/reunion_parsing.js";
+import { getSessionsFromStart, UNDEFINED_SESSION } from "../types/sessions.js";
+import { ensureAndClearDir, fetchWithRetry } from "./shared/util.js";
+import { isNoiseBlock, scoreSommaireBlockForEvent } from "../utils/scoring.js";
+import { parseYYYYMMDD } from "../utils/date.js";
 import * as git from "../git.js";
 const optionsDefinitions = [
     ...commonOptions,

package/lib/src/scripts/retrieve_documents.d.ts

@@ -1,4 +1,4 @@
-import { DocumentMetadata } from "../types/texte";
+import { DocumentMetadata } from "../types/texte.js";
 type DownloadOptions = {
     force?: boolean;
     formats?: string[];

package/lib/src/scripts/retrieve_documents.js

@@ -2,13 +2,13 @@ import commandLineArgs from "command-line-args";
 import fs from "fs-extra";
 import { DateTime } from "luxon";
 import path from "path";
-import { convertSenatXmlToHtml } from "../conversion_textes";
-import * as git from "../git";
-import { DATA_ORIGINAL_FOLDER, DATA_TRANSFORMED_FOLDER, ENRICHED_TEXTE_FOLDER, iterLoadSenatRapportUrls, iterLoadSenatTexteUrls, RAPPORT_FOLDER, TEXTE_FOLDER, } from "../loaders";
-import { parseExposeDesMotifs, parseTexte, parseTexteFromFile } from "../parsers/texte";
-import { getSessionsFromStart, UNDEFINED_SESSION } from "../types/sessions";
-import { assertExistingDirectory, commonOptions } from "./shared/cli_helpers";
-import { ensureAndClearDir, fetchWithRetry, isOptionEmptyOrHasValue } from "./shared/util";
+import { convertSenatXmlToHtml } from "../conversion_textes.js";
+import * as git from "../git.js";
+import { DATA_ORIGINAL_FOLDER, DATA_TRANSFORMED_FOLDER, ENRICHED_TEXTE_FOLDER, iterLoadSenatRapportUrls, iterLoadSenatTexteUrls, RAPPORT_FOLDER, TEXTE_FOLDER, } from "../loaders.js";
+import { parseExposeDesMotifs, parseTexte, parseTexteFromFile } from "../parsers/texte.js";
+import { getSessionsFromStart, UNDEFINED_SESSION } from "../types/sessions.js";
+import { assertExistingDirectory, commonOptions } from "./shared/cli_helpers.js";
+import { ensureAndClearDir, fetchWithRetry, isOptionEmptyOrHasValue } from "./shared/util.js";
 let exitCode = 10; // 0: some data changed, 10: no modification
 const optionsDefinitions = [
     ...commonOptions,

package/lib/src/scripts/retrieve_open_data.js

@@ -3,21 +3,21 @@ import { execFileSync } from "child_process";
 import commandLineArgs from "command-line-args";
 import fs from "fs-extra";
 import { formatWithPrettier, makePgTsGenerator, markAsGenerated, processDatabase } from "kanel";
-import { makeGenerateZodSchemas } from "kanel-zod";
 import path from "path";
 import StreamZip from "node-stream-zip";
 import readline from "readline";
 import { pipeline, Readable } from "stream";
 import { promisify } from "util";
 import * as windows1252 from "windows-1252";
-import config from "../config";
-import { getChosenDatasets, getEnabledDatasets } from "../datasets";
-import { assertExistingDirectory, commonOptions } from "./shared/cli_helpers";
-import { buildIncrementalDatasetImportSql, buildNormalizeStagingSchemaSql } from "./shared/incremental_import_sql";
-import { buildGeneratedTableManifest, getGeneratedDefinitionPath, getGeneratedTableManifestPath, prefixedName, rawTypesDir, senatSchemaName, stagingSchemaName, stripDatasetPrefix, } from "./shared/prefixed_tables";
-import { buildEnsureSchemaVersionTableSql, buildIncrementSchemaVersionSql, buildSchemaStructureFingerprintQuery, } from "./shared/schema_version";
-import { buildExportStagingMetadataStatementsQuery } from "./shared/staging_metadata_sql";
-import { isCopyFromStdinLine, rewriteLineForStagingImport } from "./shared/staging_import";
+import config from "../config.js";
+import { getChosenDatasets, getEnabledDatasets } from "../datasets.js";
+import { assertExistingDirectory, commonOptions } from "./shared/cli_helpers.js";
+import { buildIncrementalDatasetImportSql, buildNormalizeStagingSchemaSql } from "./shared/incremental_import_sql.js";
+import { buildGeneratedTableManifest, getGeneratedDefinitionPath, getGeneratedTableManifestPath, prefixedName, rawTypesDir, senatSchemaName, stagingSchemaName, stripDatasetPrefix, } from "./shared/prefixed_tables.js";
+import { buildEnsureSchemaVersionTableSql, buildIncrementSchemaVersionSql, buildSchemaStructureFingerprintQuery, } from "./shared/schema_version.js";
+import { makeGenerateZodSchemas } from "./shared/make_generate_zod_schemas.js";
+import { buildExportStagingMetadataStatementsQuery } from "./shared/staging_metadata_sql.js";
+import { isCopyFromStdinLine, rewriteLineForStagingImport } from "./shared/staging_import.js";
 const badWindows1252CharacterRegex = /[\u0080-\u009f]/g;
 const optionsDefinitions = [
     ...commonOptions,

package/lib/src/scripts/retrieve_senateurs_photos.js

@@ -6,10 +6,10 @@ import path from "path";
 import { fileURLToPath } from "url";
 // import stream from "stream"
 // import util from "util"
-import * as git from "../git";
-import { findActif as findActifSenateurs } from "../model/sens";
-import { slugify } from "../strings";
-import { assertExistingDirectory, commonOptions } from "./shared/cli_helpers";
+import * as git from "../git.js";
+import { findActif as findActifSenateurs } from "../model/sens.js";
+import { slugify } from "../strings.js";
+import { assertExistingDirectory, commonOptions } from "./shared/cli_helpers.js";
 const optionsDefinitions = [
     ...commonOptions,
     {

package/lib/src/scripts/retrieve_videos.js

@@ -4,16 +4,16 @@ import fs from "fs-extra";
 import fsp from "fs/promises";
 import path from "path";
 import * as git from "../git.js";
-import { AGENDA_FOLDER, iterLoadSenatAgendas } from "../loaders";
-import { getSessionsFromStart, UNDEFINED_SESSION } from "../types/sessions";
-import { assertExistingDirectory, commonOptions } from "./shared/cli_helpers";
-import { getAgendaSegmentTimecodes, buildSenatVodMasterM3u8FromNvs } from "../utils/nvs-parsing";
-import { epochToParisDateTime, isAmbiguousTimeOriginal, toTargetEpoch } from "../utils/date";
+import { AGENDA_FOLDER, iterLoadSenatAgendas } from "../loaders.js";
+import { getSessionsFromStart, UNDEFINED_SESSION } from "../types/sessions.js";
+import { assertExistingDirectory, commonOptions } from "./shared/cli_helpers.js";
+import { getAgendaSegmentTimecodes, buildSenatVodMasterM3u8FromNvs } from "../utils/nvs-parsing.js";
+import { epochToParisDateTime, isAmbiguousTimeOriginal, toTargetEpoch } from "../utils/date.js";
 import { pathToFileURL } from "url";
-import { fetchCandidatesForAgenda, fetchText } from "../videos/search";
-import { matchAgendaToVideo } from "../videos/match";
-import { SENAT_DATAS_ROOT, STATS, VIDEOS_ROOT_FOLDER, weights } from "../videos/config";
-import { processBisIfNeeded, processOneReunionMatch, writeIfChanged } from "../videos";
+import { fetchCandidatesForAgenda, fetchText } from "../videos/search.js";
+import { matchAgendaToVideo } from "../videos/match.js";
+import { SENAT_DATAS_ROOT, STATS, VIDEOS_ROOT_FOLDER, weights } from "../videos/config.js";
+import { processBisIfNeeded, processOneReunionMatch, writeIfChanged } from "../videos/index.js";
 const optionsDefinitions = [...commonOptions];
 const options = commandLineArgs(optionsDefinitions);
 let exitCode = 10; // 0: some data changed, 10: no modification

package/lib/src/scripts/shared/incremental_import_sql.js

@@ -1,4 +1,4 @@
-import { prefixedName, senatSchemaName, stagingSchemaName } from "./prefixed_tables";
+import { prefixedName, senatSchemaName, stagingSchemaName } from "./prefixed_tables.js";
 function escapeSqlLiteral(value) {
     return value.replace(/'/g, "''");
 }

package/lib/src/scripts/shared/make_generate_zod_schemas.d.ts

@@ -0,0 +1,20 @@
+import type { TableColumn, TableDetails } from "extract-pg-schema";
+import { type Details, type Path, type PgTsGeneratorContext, type PgTsPreRenderHook, type TypeMap } from "kanel";
+type GenerateFor = "selector" | "initializer" | "mutator" | undefined;
+type ZodSchemaMetadata = {
+    comment?: string[];
+    name: string;
+    path: Path;
+};
+type ZodIdentifierMetadata = {
+    comment?: string[];
+    name: string;
+};
+type GenerateZodSchemasConfig = {
+    castToSchema?: boolean;
+    getZodIdentifierMetadata?: (column: TableColumn, details: TableDetails, context: PgTsGeneratorContext) => ZodIdentifierMetadata;
+    getZodSchemaMetadata?: (details: Details, generateFor: GenerateFor, context: PgTsGeneratorContext) => ZodSchemaMetadata;
+    zodTypeMap?: TypeMap;
+};
+export declare function makeGenerateZodSchemas(config?: GenerateZodSchemasConfig): PgTsPreRenderHook;
+export {};

package/lib/src/scripts/shared/make_generate_zod_schemas.js

@@ -0,0 +1,300 @@
+import { escapeName, resolveType, useKanelContext, } from "kanel";
+import { defaultGetZodIdentifierMetadata, defaultGetZodSchemaMetadata, defaultZodTypeMap } from "kanel-zod";
+const zImport = {
+    asName: undefined,
+    importAsType: false,
+    isAbsolute: true,
+    isDefault: false,
+    name: "z",
+    path: "zod",
+};
+function appendTsDeclaration(output, path, declaration) {
+    const file = output[path];
+    if (!file || file.fileType !== "typescript") {
+        throw new Error(`Path ${path} is not a typescript file`);
+    }
+    file.declarations.push(declaration);
+}
+function toMetaQualifier(comment) {
+    if (!comment || comment.length === 0) {
+        return undefined;
+    }
+    const description = comment.join(" ").replace(/\n/g, " ");
+    return `meta({ description: ${JSON.stringify(description)} })`;
+}
+function generateProperties(details, generateFor, nonCompositeTypeImports, compositeTypeImports, identifierTypeImports, zodTypeMap, context) {
+    const properties = details.kind === "compositeType" ? [...details.attributes] : [...details.columns];
+    const sortedProperties = context.propertySortFunction ? properties.sort(context.propertySortFunction) : properties;
+    return sortedProperties.map((property) => {
+        const { comment, name, nullableOverride, optionalOverride, typeOverride } = context.getPropertyMetadata(property, details, generateFor);
+        const canBeOptional = property.isNullable || property.defaultValue || property.isIdentity;
+        const resolvedType = typeOverride ?? resolveType(property, details);
+        let zodType = "z.unknown()";
+        const typeImports = [];
+        if (typeof resolvedType !== "string" && `${details.schemaName}.${resolvedType.name}` in identifierTypeImports) {
+            const typeImport = identifierTypeImports[`${details.schemaName}.${resolvedType.name}`];
+            typeImports.push(typeImport);
+            zodType = typeImport.name;
+        }
+        else if (property.type.fullName in zodTypeMap) {
+            const mappedType = zodTypeMap[property.type.fullName];
+            if (typeof mappedType === "string") {
+                zodType = mappedType;
+                if ("dimensions" in property) {
+                    for (let i = property.dimensions || 0; i > 0; i -= 1) {
+                        zodType = `${zodType}.array()`;
+                    }
+                }
+            }
+            else {
+                zodType = mappedType.name;
+                typeImports.push(...mappedType.typeImports);
+            }
+        }
+        else if (property.type.fullName in nonCompositeTypeImports) {
+            const typeImport = nonCompositeTypeImports[property.type.fullName];
+            typeImports.push(typeImport);
+            zodType = typeImport.name;
+        }
+        else if (property.type.fullName in compositeTypeImports) {
+            const typeImport = compositeTypeImports[property.type.fullName];
+            typeImports.push(typeImport);
+            zodType = typeImport.name;
+            if (property.isArray) {
+                zodType = `${zodType}.array()`;
+            }
+            if (property.isNullable) {
+                zodType = `${zodType}.nullable()`;
+            }
+        }
+        else {
+            console.error(`kanel-zod: Unknown type for ${name}.${property.name}: ${property.type.fullName}`);
+        }
+        let isOptional;
+        if (optionalOverride === undefined) {
+            switch (generateFor) {
+                case "selector":
+                    isOptional = false;
+                    break;
+                case "initializer":
+                    isOptional = Boolean(canBeOptional);
+                    break;
+                case "mutator":
+                    isOptional = true;
+                    break;
+            }
+        }
+        else {
+            isOptional = optionalOverride;
+        }
+        const qualifiers = [];
+        if (isOptional) {
+            qualifiers.push("optional()");
+        }
+        if (nullableOverride ?? property.isNullable) {
+            qualifiers.push("nullable()");
+        }
+        const metaQualifier = toMetaQualifier(comment);
+        if (metaQualifier) {
+            qualifiers.push(metaQualifier);
+        }
+        return {
+            name,
+            typeImports,
+            value: qualifiers.length > 0 ? `${zodType}.${qualifiers.join(".")}` : zodType,
+        };
+    });
+}
+function buildCompositeDeclaration(details, generateFor, nonCompositeTypeImports, compositeTypeImports, identifierTypeImports, getZodSchemaMetadata, zodTypeMap, castToSchema, context) {
+    const { comment, name } = getZodSchemaMetadata(details, generateFor, context);
+    const { name: typescriptTypeName } = context.getMetadata(details, generateFor);
+    const properties = generateProperties(details, generateFor, nonCompositeTypeImports, compositeTypeImports, identifierTypeImports, zodTypeMap, context);
+    const typeImports = [zImport];
+    const value = ["z.object({", ...properties.map((property) => `  ${escapeName(property.name)}: ${property.value},`)];
+    if (castToSchema) {
+        value.push(`}) as unknown as z.Schema<${typescriptTypeName}>`);
+    }
+    else {
+        value.push("})");
+    }
+    properties.forEach((property) => {
+        typeImports.push(...property.typeImports);
+    });
+    return {
+        comment,
+        declarationType: "constant",
+        exportAs: "named",
+        name,
+        type: undefined,
+        typeImports,
+        value,
+    };
+}
+function buildIdentifierDeclarations(details, getZodIdentifierMetadata, zodTypeMap, castToSchema, nonCompositeTypeImports, context) {
+    if (!context.generateIdentifierType) {
+        return [];
+    }
+    const generateIdentifierType = context.generateIdentifierType;
+    return details.columns
+        .filter((column) => column.isPrimaryKey && !column.reference)
+        .map((column) => {
+        const typescriptDeclaration = generateIdentifierType(column, details);
+        const { comment, name } = getZodIdentifierMetadata(column, details, context);
+        let zodType = "z.unknown()";
+        const typeImports = [zImport];
+        if (column.type.fullName in zodTypeMap) {
+            const mappedType = zodTypeMap[column.type.fullName];
+            if (typeof mappedType === "string") {
+                zodType = mappedType;
+            }
+            else {
+                zodType = mappedType.name;
+                typeImports.push(...mappedType.typeImports);
+            }
+        }
+        else if (column.type.fullName in nonCompositeTypeImports) {
+            const typeImport = nonCompositeTypeImports[column.type.fullName];
+            zodType = typeImport.name;
+            typeImports.push(typeImport);
+        }
+        return {
+            declaration: {
+                comment,
+                declarationType: "constant",
+                exportAs: "named",
+                name,
+                type: undefined,
+                typeImports,
+                value: castToSchema
+                    ? `${zodType} as unknown as z.Schema<${typescriptDeclaration.name}>`
+                    : `${zodType}.transform(value => value as ${typescriptDeclaration.name})`,
+            },
+            name,
+            originalName: typescriptDeclaration.name,
+        };
+    });
+}
+export function makeGenerateZodSchemas(config = {}) {
+    return async (outputAcc, context) => {
+        const kanelContext = useKanelContext();
+        const output = { ...outputAcc };
+        const getZodSchemaMetadata = config.getZodSchemaMetadata ?? defaultGetZodSchemaMetadata;
+        const getZodIdentifierMetadata = config.getZodIdentifierMetadata ?? defaultGetZodIdentifierMetadata;
+        const zodTypeMap = { ...defaultZodTypeMap, ...(config.zodTypeMap ?? {}) };
+        const castToSchema = config.castToSchema ?? true;
+        const nonCompositeTypeImports = {};
+        const identifierTypeImports = {};
+        const compositeTypeImports = {};
+        for (const schema of Object.values(kanelContext.schemas)) {
+            schema.enums?.forEach((enumDetails) => {
+                const { name, path } = getZodSchemaMetadata(enumDetails, undefined, context);
+                appendTsDeclaration(output, path, {
+                    comment: [`Zod schema for ${enumDetails.name}`],
+                    declarationType: "constant",
+                    exportAs: "named",
+                    name,
+                    type: undefined,
+                    typeImports: [zImport],
+                    value: ["z.enum([", ...enumDetails.values.map((value) => `  '${value}',`), "])"],
+                });
+                nonCompositeTypeImports[`${enumDetails.schemaName}.${enumDetails.name}`] = {
+                    asName: undefined,
+                    importAsType: false,
+                    isAbsolute: false,
+                    isDefault: false,
+                    name,
+                    path,
+                };
+            });
+            schema.ranges?.forEach((rangeDetails) => {
+                const { name, path } = getZodSchemaMetadata(rangeDetails, undefined, context);
+                appendTsDeclaration(output, path, {
+                    comment: [`Zod schema for ${rangeDetails.name}`],
+                    declarationType: "constant",
+                    exportAs: "named",
+                    name,
+                    type: undefined,
+                    typeImports: [zImport],
+                    value: "z.string()",
+                });
+                nonCompositeTypeImports[`${rangeDetails.schemaName}.${rangeDetails.name}`] = {
+                    asName: undefined,
+                    importAsType: false,
+                    isAbsolute: false,
+                    isDefault: false,
+                    name,
+                    path,
+                };
+            });
+            schema.domains?.forEach((domainDetails) => {
+                const { name, path } = getZodSchemaMetadata(domainDetails, undefined, context);
+                const domainType = zodTypeMap[domainDetails.innerType] ?? "z.unknown()";
+                appendTsDeclaration(output, path, {
+                    comment: [`Zod schema for ${domainDetails.name}`],
+                    declarationType: "constant",
+                    exportAs: "named",
+                    name,
+                    type: undefined,
+                    typeImports: [zImport, ...(typeof domainType === "string" ? [] : domainType.typeImports)],
+                    value: typeof domainType === "string" ? domainType : domainType.name,
+                });
+                nonCompositeTypeImports[`${domainDetails.schemaName}.${domainDetails.name}`] = {
+                    asName: undefined,
+                    importAsType: false,
+                    isAbsolute: false,
+                    isDefault: false,
+                    name,
+                    path,
+                };
+            });
+            schema.tables?.forEach((tableDetails) => {
+                const { path } = getZodSchemaMetadata(tableDetails, undefined, context);
+                const declarations = buildIdentifierDeclarations(tableDetails, getZodIdentifierMetadata, zodTypeMap, castToSchema, nonCompositeTypeImports, context);
+                declarations.forEach(({ declaration, name, originalName }) => {
+                    appendTsDeclaration(output, path, declaration);
+                    identifierTypeImports[`${tableDetails.schemaName}.${originalName}`] = {
+                        asName: undefined,
+                        importAsType: false,
+                        isAbsolute: false,
+                        isDefault: false,
+                        name,
+                        path,
+                    };
+                });
+            });
+            [
+                ...(schema.tables ?? []),
+                ...(schema.views ?? []),
+                ...(schema.materializedViews ?? []),
+                ...(schema.compositeTypes ?? []),
+            ].forEach((compositeDetails) => {
+                const { name, path } = getZodSchemaMetadata(compositeDetails, undefined, context);
+                compositeTypeImports[`${compositeDetails.schemaName}.${compositeDetails.name}`] = {
+                    asName: undefined,
+                    importAsType: false,
+                    isAbsolute: false,
+                    isDefault: false,
+                    name,
+                    path,
+                };
+            });
+        }
+        for (const schema of Object.values(kanelContext.schemas)) {
+            ;
+            [
+                ...(schema.tables ?? []),
+                ...(schema.views ?? []),
+                ...(schema.materializedViews ?? []),
+                ...(schema.compositeTypes ?? []),
+            ].forEach((compositeDetails) => {
+                const { path } = getZodSchemaMetadata(compositeDetails, undefined, context);
+                appendTsDeclaration(output, path, buildCompositeDeclaration(compositeDetails, "selector", nonCompositeTypeImports, compositeTypeImports, identifierTypeImports, getZodSchemaMetadata, zodTypeMap, castToSchema, context));
+                if (compositeDetails.kind === "table") {
+                    appendTsDeclaration(output, path, buildCompositeDeclaration(compositeDetails, "initializer", nonCompositeTypeImports, compositeTypeImports, identifierTypeImports, getZodSchemaMetadata, zodTypeMap, castToSchema, context));
+                    appendTsDeclaration(output, path, buildCompositeDeclaration(compositeDetails, "mutator", nonCompositeTypeImports, compositeTypeImports, identifierTypeImports, getZodSchemaMetadata, zodTypeMap, castToSchema, context));
+                }
+            });
+        }
+        return output;
+    };
+}

package/lib/src/scripts/shared/staging_import.d.ts

@@ -1,3 +1,3 @@
-import type { Dataset } from "../../datasets";
+import type { Dataset } from "../../datasets.js";
 export declare function isCopyFromStdinLine(line: string): boolean;
 export declare function rewriteLineForStagingImport(line: string, dataset: Dataset, stagingSchema: string, inCopyData?: boolean): string;

package/lib/src/scripts/validate_prefixed_tables.js

@@ -1,9 +1,9 @@
 import commandLineArgs from "command-line-args";
 import fs from "fs-extra";
-import { sql } from "../databases_postgres";
-import { getChosenDatasets, getEnabledDatasets } from "../datasets";
-import { categoriesOption, silentOption } from "./shared/cli_helpers";
-import { extractPrefixedTableNamesFromGeneratedManifest, getGeneratedTableManifestPath, senatSchemaName, } from "./shared/prefixed_tables";
+import { sql } from "../databases_postgres.js";
+import { getChosenDatasets, getEnabledDatasets } from "../datasets.js";
+import { categoriesOption, silentOption } from "./shared/cli_helpers.js";
+import { extractPrefixedTableNamesFromGeneratedManifest, getGeneratedTableManifestPath, senatSchemaName, } from "./shared/prefixed_tables.js";
 const optionsDefinitions = [categoriesOption, silentOption];
 const options = commandLineArgs(optionsDefinitions);
 async function listPrefixedSenatTables(dataset) {

package/lib/src/types/ameli.d.ts

@@ -1,5 +1,5 @@
-import { TxtAmeli } from "../raw_types/ameli";
-import { Sub } from "../raw_types/ameli";
+import { TxtAmeli } from "../raw_types/ameli.js";
+import { Sub } from "../raw_types/ameli.js";
 export interface TxtAmeliCustom extends TxtAmeli {
     subids?: Sub["id"][];
 }

package/lib/src/types/dosleg.d.ts

@@ -1,7 +1,7 @@
-import { Ass, Aud as AudRaw, Auteur as AuteurRaw, DateSeance as DateSeanceRaw, Deccoc, Denrap, Docatt as DocattRaw, Ecr as EcrRaw, Etaloi, Lecass as LecassRaw, Lecassrap as LecassrapRaw, Lecture as LectureRaw, Loi as LoiRaw, Org, Oritxt, Qua, Rap as RapRaw, Raporg, Scr, Texte as TexteRaw, Typatt, Typlec, Typloi, Typtxt, Typurl } from "../raw_types/dosleg";
-import { TxtAmeli } from "../raw_types/ameli";
-import { Debats } from "../raw_types/debats";
-import { TxtAmeliCustom } from "./ameli";
+import { Ass, Aud as AudRaw, Auteur as AuteurRaw, DateSeance as DateSeanceRaw, Deccoc, Denrap, Docatt as DocattRaw, Ecr as EcrRaw, Etaloi, Lecass as LecassRaw, Lecassrap as LecassrapRaw, Lecture as LectureRaw, Loi as LoiRaw, Org, Oritxt, Qua, Rap as RapRaw, Raporg, Scr, Texte as TexteRaw, Typatt, Typlec, Typloi, Typtxt, Typurl } from "../raw_types/dosleg.js";
+import { TxtAmeli } from "../raw_types/ameli.js";
+import { Debats } from "../raw_types/debats.js";
+import { TxtAmeliCustom } from "./ameli.js";
 export type { Deccoc as DecCoc, Denrap as DenRap, Etaloi as EtaLoi, Oritxt as OriTxt, Raporg as RapOrg, Typatt as TypAtt, Typlec as TypLec, Typloi as TypLoi, Typtxt as TypTxt, Typurl as TypUrl, };
 export interface Aud extends AudRaw {
     org?: Org;

package/lib/src/types/questions.d.ts

@@ -1,2 +1,2 @@
-import { TamQuestions } from "../raw_types/questions";
+import { TamQuestions } from "../raw_types/questions.js";
 export type { TamQuestions as Question };

package/lib/src/types/texte.d.ts

@@ -1,4 +1,4 @@
-import { DocumentResult } from "../loaders";
+import { DocumentResult } from "../loaders.js";
 export declare enum DivisionType {
     tome = 1,
     part = 2,

package/lib/src/utils/cr_spliting.d.ts

@@ -1,4 +1,4 @@
-import { Reunion } from "../types/agenda";
+import { Reunion } from "../types/agenda.js";
 type MetadataDay = {
     date: string;
     openTime?: string;