@kywi-software/core 0.5.0 → 0.6.1

package/dist/scope/kywi-wizard-form.js

@@ -3,6 +3,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useState } from 'react';
 import { sanitizeHtml } from '../util/sanitize.js';
 import { validateStep } from '../forms/multi-step.js';
+import { validateFileConstraints } from '../forms/validation.js';
 // ─── Component ────────────────────────────────────────────────────────────────
 export function KywiWizardForm({ action, config, className }) {
     const { steps, submitLabel = 'Submit' } = config;
@@ -13,6 +14,9 @@ export function KywiWizardForm({ action, config, className }) {
     const step = steps[currentStep];
     const isFirst = currentStep === 0;
     const isLast = currentStep === total - 1;
+    // File fields make the native submit multipart so the bytes reach the server.
+    const allFields = steps.flatMap(s => s.fields);
+    const hasFileField = allFields.some(f => f.type === 'file');
     // currentStep is always kept within range, so `step` is defined in practice;
     // this guard satisfies noUncheckedIndexedAccess and narrows it for the closures below.
     if (!step)
@@ -46,6 +50,20 @@ export function KywiWizardForm({ action, config, className }) {
         setErrors({});
         setCurrentStep(i => i + 1);
     }
+    function validateFiles() {
+        const fileErrors = {};
+        for (const field of allFields) {
+            if (field.type !== 'file')
+                continue;
+            const val = formData[field.name];
+            if (typeof File !== 'undefined' && val instanceof File) {
+                const check = validateFileConstraints(field, { name: val.name, size: val.size, type: val.type });
+                if (!check.ok)
+                    fileErrors[field.name] = check.message;
+            }
+        }
+        return fileErrors;
+    }
     function handleSubmit(e) {
         if (!step)
             return;
@@ -53,13 +71,21 @@ export function KywiWizardForm({ action, config, className }) {
         if (!valid) {
             e.preventDefault();
             setErrors(stepErrors);
+            return;
+        }
+        const fileErrors = validateFiles();
+        if (Object.keys(fileErrors).length > 0) {
+            e.preventDefault();
+            setErrors(fileErrors);
         }
     }
-    return (_jsxs("form", { action: action, method: "POST", className: `kywi-wizard-form ${className ?? ''}`.trim(), onSubmit: handleSubmit, children: [_jsx("nav", { className: "kywi-wizard-progress", "aria-label": "Form progress", children: _jsx("ol", { className: "kywi-wizard-steps", children: steps.map((s, i) => (_jsxs("li", { className: [
+    return (_jsxs("form", { action: action, method: "POST", encType: hasFileField ? 'multipart/form-data' : undefined, className: `kywi-wizard-form ${className ?? ''}`.trim(), onSubmit: handleSubmit, children: [_jsx("nav", { className: "kywi-wizard-progress", "aria-label": "Form progress", children: _jsx("ol", { className: "kywi-wizard-steps", children: steps.map((s, i) => (_jsxs("li", { className: [
                             'kywi-wizard-step',
                             i === currentStep ? 'kywi-wizard-step--current' : '',
                             i < currentStep ? 'kywi-wizard-step--complete' : '',
-                        ].filter(Boolean).join(' '), "aria-current": i === currentStep ? 'step' : undefined, children: [_jsx("span", { className: "kywi-wizard-step-number", children: i + 1 }), _jsx("span", { className: "kywi-wizard-step-label", children: s.label })] }, s.name))) }) }), _jsxs("p", { className: "kywi-wizard-step-indicator", children: ["Step ", currentStep + 1, " of ", total] }), _jsx("div", { className: "kywi-wizard-fields", children: step.fields.map(field => (_jsx(WizardField, { field: field, value: formData[field.name], error: errors[field.name], onChange: handleFieldChange }, field.name))) }), Object.entries(formData).map(([key, val]) => (_jsx("input", { type: "hidden", name: key, value: String(val ?? '') }, key))), _jsxs("div", { className: "kywi-wizard-nav", children: [!isFirst && (_jsx("button", { type: "button", className: "kywi-wizard-back", onClick: handleBack, children: "Back" })), !isLast && (_jsx("button", { type: "button", className: "kywi-wizard-next", onClick: handleNext, children: "Next" })), isLast && (_jsx("button", { type: "submit", className: "kywi-wizard-submit", children: submitLabel }))] })] }));
+                        ].filter(Boolean).join(' '), "aria-current": i === currentStep ? 'step' : undefined, children: [_jsx("span", { className: "kywi-wizard-step-number", children: i + 1 }), _jsx("span", { className: "kywi-wizard-step-label", children: s.label })] }, s.name))) }) }), _jsxs("p", { className: "kywi-wizard-step-indicator", children: ["Step ", currentStep + 1, " of ", total] }), _jsx("div", { className: "kywi-wizard-fields", children: step.fields.map(field => (_jsx(WizardField, { field: field, value: formData[field.name], error: errors[field.name], onChange: handleFieldChange }, field.name))) }), Object.entries(formData).map(([key, val]) => (typeof File !== 'undefined' && val instanceof File)
+                ? null
+                : _jsx("input", { type: "hidden", name: key, value: String(val ?? '') }, key)), _jsxs("div", { className: "kywi-wizard-nav", children: [!isFirst && (_jsx("button", { type: "button", className: "kywi-wizard-back", onClick: handleBack, children: "Back" })), !isLast && (_jsx("button", { type: "button", className: "kywi-wizard-next", onClick: handleNext, children: "Next" })), isLast && (_jsx("button", { type: "submit", className: "kywi-wizard-submit", children: submitLabel }))] })] }));
 }
 function WizardField({ field, value, error, onChange }) {
     if (field.type === 'html') {
@@ -97,7 +123,7 @@ function renderWizardInput(field, id, value, onChange) {
         case 'checkbox':
             return (_jsx("input", { type: "checkbox", ...common, className: "kywi-wizard-checkbox", checked: value === 'true' || value === 'on', onChange: e => onChange(field.name, e.target.checked) }));
         case 'file':
-            return (_jsx("input", { type: "file", ...common, className: "kywi-wizard-file", onChange: e => onChange(field.name, e.target.value) }));
+            return (_jsx("input", { type: "file", ...common, className: "kywi-wizard-file", accept: field.validation?.accept?.join(','), onChange: e => onChange(field.name, e.target.files?.[0]) }));
         default:
             return (_jsx("input", { type: field.type === 'email'
                     ? 'email'

package/dist/scope/kywi-wizard-form.js.map

@@ -1 +1 @@
-{"version":3,"file":"kywi-wizard-form.js","sourceRoot":"","sources":["../../src/scope/kywi-wizard-form.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"kywi-wizard-form.js","sourceRoot":"","sources":["../../src/scope/kywi-wizard-form.tsx"],"names":[],"mappings":"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"}

package/dist/versioning/scheduler.d.ts

@@ -1,4 +1,11 @@
 import type { KywiDb } from '../db/client.js';
+import { type ResolveChangesetType } from '../db/changeset-queries.js';
+/** Options threaded into the scheduled-changeset publish path (#63). */
+export interface SchedulerResolveOptions {
+    /** Resolve a content type → its custom side-table, so scheduled publishes
+     * round-trip custom fields exactly as an interactive publish does. */
+    resolveType?: ResolveChangesetType;
+}
 /**
  * Auto-publish approved content.
  * Content in 'approved' status that hasn't been published yet gets published.
@@ -13,7 +20,7 @@ export declare function unpublishExpiredContent(db: KywiDb): Promise<number>;
  * Publish changesets whose scheduledPublishAt has passed and status is still 'open'.
  * Returns the number of changesets published.
  */
-export declare function publishScheduledChangesets(db: KywiDb): Promise<number>;
+export declare function publishScheduledChangesets(db: KywiDb, opts?: SchedulerResolveOptions): Promise<number>;
 /**
  * W7: Reset featured status on content-category assignments whose
  * featuredUntil date has passed.
@@ -22,7 +29,7 @@ export declare function resetExpiredFeatured(db: KywiDb): Promise<number>;
 /**
  * Run publishing, expiration, and featured-reset checks. Returns counts.
  */
-export declare function runScheduler(db: KywiDb): Promise<{
+export declare function runScheduler(db: KywiDb, opts?: SchedulerResolveOptions): Promise<{
     published: number;
     expired: number;
     changesets: number;
@@ -43,5 +50,6 @@ export interface SchedulerHandle {
 export declare function startScheduler(db: KywiDb, opts: {
     intervalSeconds: number;
     onError?: (err: unknown) => void;
+    resolveType?: ResolveChangesetType;
 }): SchedulerHandle;
 //# sourceMappingURL=scheduler.d.ts.map

package/dist/versioning/scheduler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scheduler.d.ts","sourceRoot":"","sources":["../../src/versioning/scheduler.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AAG7C;;;;GAIG;AACH,wBAAsB,uBAAuB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAczE;AAED;;GAEG;AACH,wBAAsB,uBAAuB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAWzE;AAED;;;GAGG;AACH,wBAAsB,0BAA0B,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAiB5E;AAED;;;GAGG;AACH,wBAAsB,oBAAoB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAWtE;AAED;;GAEG;AACH,wBAAsB,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,MAAM,CAAA;CAAE,CAAC,CAMzI;AAED,MAAM,WAAW,eAAe;IAC9B,gCAAgC;IAChC,IAAI,IAAI,IAAI,CAAA;CACb;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAC5B,EAAE,EAAE,MAAM,EACV,IAAI,EAAE;IAAE,eAAe,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,IAAI,CAAA;CAAE,GAClE,eAAe,CAqBjB"}
+{"version":3,"file":"scheduler.d.ts","sourceRoot":"","sources":["../../src/versioning/scheduler.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AAC7C,OAAO,EAAoB,KAAK,oBAAoB,EAAE,MAAM,4BAA4B,CAAA;AAExF,wEAAwE;AACxE,MAAM,WAAW,uBAAuB;IACtC;0EACsE;IACtE,WAAW,CAAC,EAAE,oBAAoB,CAAA;CACnC;AAED;;;;GAIG;AACH,wBAAsB,uBAAuB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAczE;AAED;;GAEG;AACH,wBAAsB,uBAAuB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAWzE;AAED;;;GAGG;AACH,wBAAsB,0BAA0B,CAC9C,EAAE,EAAE,MAAM,EACV,IAAI,CAAC,EAAE,uBAAuB,GAC7B,OAAO,CAAC,MAAM,CAAC,CAuBjB;AAED;;;GAGG;AACH,wBAAsB,oBAAoB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAWtE;AAED;;GAEG;AACH,wBAAsB,YAAY,CAChC,EAAE,EAAE,MAAM,EACV,IAAI,CAAC,EAAE,uBAAuB,GAC7B,OAAO,CAAC;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,MAAM,CAAA;CAAE,CAAC,CAM5F;AAED,MAAM,WAAW,eAAe;IAC9B,gCAAgC;IAChC,IAAI,IAAI,IAAI,CAAA;CACb;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAC5B,EAAE,EAAE,MAAM,EACV,IAAI,EAAE;IAAE,eAAe,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,IAAI,CAAC;IAAC,WAAW,CAAC,EAAE,oBAAoB,CAAA;CAAE,GACtG,eAAe,CAsBjB"}

package/dist/versioning/scheduler.js

@@ -29,7 +29,7 @@ export async function unpublishExpiredContent(db) {
  * Publish changesets whose scheduledPublishAt has passed and status is still 'open'.
  * Returns the number of changesets published.
  */
-export async function publishScheduledChangesets(db) {
+export async function publishScheduledChangesets(db, opts) {
     const now = new Date();
     const rows = await db
         .select({ id: kywiChangesets.id })
@@ -37,7 +37,14 @@ export async function publishScheduledChangesets(db) {
         .where(and(eq(kywiChangesets.status, 'open'), sql `${kywiChangesets.scheduledPublishAt} IS NOT NULL`, sql `${kywiChangesets.scheduledPublishAt} <= NOW()`));
     let count = 0;
     for (const row of rows) {
-        await publishChangeset(db, row.id, 'scheduler');
+        // Pass the resolver only when present so existing callers (and their tests)
+        // see the unchanged 3-argument publishChangeset call.
+        if (opts?.resolveType) {
+            await publishChangeset(db, row.id, 'scheduler', { resolveType: opts.resolveType });
+        }
+        else {
+            await publishChangeset(db, row.id, 'scheduler');
+        }
         count++;
     }
     return count;
@@ -57,10 +64,10 @@ export async function resetExpiredFeatured(db) {
 /**
  * Run publishing, expiration, and featured-reset checks. Returns counts.
  */
-export async function runScheduler(db) {
+export async function runScheduler(db, opts) {
     const published = await publishScheduledContent(db);
     const expired = await unpublishExpiredContent(db);
-    const changesets = await publishScheduledChangesets(db);
+    const changesets = await publishScheduledChangesets(db, opts);
     const featuredReset = await resetExpiredFeatured(db);
     return { published, expired, changesets, featuredReset };
 }
@@ -75,12 +82,13 @@ export async function runScheduler(db) {
 export function startScheduler(db, opts) {
     const ms = Math.max(1, opts.intervalSeconds) * 1000;
     const onError = opts.onError ?? ((err) => console.warn('[kywi:scheduler] sweep failed:', err));
+    const resolveOpts = opts.resolveType ? { resolveType: opts.resolveType } : undefined;
     let running = false;
     const timer = setInterval(() => {
         if (running)
             return;
         running = true;
-        void runScheduler(db)
+        void runScheduler(db, resolveOpts)
             .catch(onError)
             .finally(() => {
             running = false;

package/dist/versioning/scheduler.js.map

@@ -1 +1 @@
-{"version":3,"file":"scheduler.js","sourceRoot":"","sources":["../../src/versioning/scheduler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"scheduler.js","sourceRoot":"","sources":["../../src/versioning/scheduler.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kywi-software/core",
-  "version": "0.5.0",
+  "version": "0.6.1",
   "description": "Kywi CMS core — schema generator, REST API, and admin UI for Next.js.",
   "type": "module",
   "license": "AGPL-3.0-only",
@@ -38,15 +38,18 @@
     },
     "./admin": {
       "types": "./dist/admin/index.d.ts",
-      "import": "./dist/admin/index.js"
+      "import": "./dist/admin/index.js",
+      "default": "./dist/admin/index.js"
     },
     "./admin/app": {
       "types": "./dist/admin/app.d.ts",
-      "import": "./dist/admin/app.js"
+      "import": "./dist/admin/app.js",
+      "default": "./dist/admin/app.js"
     },
     "./admin/server": {
       "types": "./dist/admin/server.d.ts",
-      "import": "./dist/admin/server.js"
+      "import": "./dist/admin/server.js",
+      "default": "./dist/admin/server.js"
     },
     "./admin/styles.css": "./dist/admin/styles/admin.css",
     "./site/styles.css": "./dist/site/styles.css",
@@ -70,6 +73,11 @@
       "types": "./dist/audiences/types.d.ts",
       "import": "./dist/audiences/types.js"
     },
+    "./audiences/utm-persistence": {
+      "types": "./dist/audiences/utm-persistence.d.ts",
+      "import": "./dist/audiences/utm-persistence.js",
+      "default": "./dist/audiences/utm-persistence.js"
+    },
     "./experiments": {
       "types": "./dist/experiments/index.d.ts",
       "import": "./dist/experiments/index.js"