@oktis-works/cms 0.13.7 → 0.13.8

package/dist/generated/app-versions.js

@@ -3,12 +3,12 @@
 // by `bun run build`. Used as the offline fallback for `okcms init` ranges
 // when the npm registry cannot be reached.
 export const APP_VERSIONS = {
-    '@oktis-works/api': '0.16.2',
-    '@oktis-works/admin': '0.23.3',
-    '@oktis-works/web': '0.12.5',
-    '@oktis-works/worker': '0.8.11',
-    '@oktis-works/core': '0.14.2',
-    '@oktis-works/plugin-runtime': '0.7.1',
-    '@oktis-works/cms': '0.13.7',
+    '@oktis-works/api': '0.16.3',
+    '@oktis-works/admin': '0.24.0',
+    '@oktis-works/web': '0.13.0',
+    '@oktis-works/worker': '0.8.12',
+    '@oktis-works/core': '0.15.0',
+    '@oktis-works/plugin-runtime': '0.7.2',
+    '@oktis-works/cms': '0.13.8',
 };
 //# sourceMappingURL=app-versions.js.map

package/migrations/V004__core__seed_default_field_groups.sql

@@ -12,11 +12,7 @@ WITH pg AS (
     '{"content_type": ["post"]}'::jsonb,
     'normal', 'standard', true, '{}'::jsonb
   )
-  ON CONFLICT (key) DO UPDATE SET
-    title = EXCLUDED.title,
-    location_rules = EXCLUDED.location_rules,
-    active = EXCLUDED.active,
-    updated_at = NOW()
+  ON CONFLICT DO NOTHING
   RETURNING id AS group_id
 ),
 pa AS (
@@ -28,11 +24,7 @@ pa AS (
     '{"content_type": ["page"]}'::jsonb,
     'normal', 'standard', true, '{}'::jsonb
   )
-  ON CONFLICT (key) DO UPDATE SET
-    title = EXCLUDED.title,
-    location_rules = EXCLUDED.location_rules,
-    active = EXCLUDED.active,
-    updated_at = NOW()
+  ON CONFLICT DO NOTHING
   RETURNING id AS group_id
 ),
 -- Inserir core fields para Post
@@ -49,15 +41,15 @@ pf AS (
     true, v.is_locked, v.core_field_key
   FROM pg
   CROSS JOIN (VALUES
-    ('text', 'title', 'title', 'Título', 'Título do post', true, '{}'::jsonb, 1, true, 'title'),
-    ('slug', 'slug', 'slug', 'Slug', 'URL amigável (único)', true, '{}'::jsonb, 2, true, 'slug'),
-    ('wysiwyg', 'content', 'content', 'Conteúdo', 'Corpo principal do post', true, '{}'::jsonb, 3, false, 'content'),
-    ('textarea', 'excerpt', 'excerpt', 'Resumo', 'Resumo curto para listagens', false, '{}'::jsonb, 4, false, 'excerpt'),
-    ('image', 'featured_image', 'featured_image', 'Imagem Destacada', 'Imagem principal do post', false, '{}'::jsonb, 5, false, 'featured_image'),
-    ('text', 'seo_title', 'seo_title', 'SEO Title', 'Título para SEO (meta title)', false, '{}'::jsonb, 6, false, 'seo_title'),
-    ('textarea', 'seo_description', 'seo_description', 'SEO Description', 'Descrição para SEO (meta description)', false, '{}'::jsonb, 7, false, 'seo_description'),
-    ('select', 'status', 'status', 'Status', 'Status de publicação', true, '{"options":[{"value":"DRAFT","label":"Rascunho"},{"value":"PUBLISHED","label":"Publicado"},{"value":"ARCHIVED","label":"Arquivado"},{"value":"TRASHED","label":"Lixeira"}]}'::jsonb, 8, false, 'status'),
-    ('user', 'author', 'author', 'Autor', 'Autor do post', true, '{}'::jsonb, 9, false, 'author')
+    ('text', 'title', 'title', 'Title', 'Post title', true, '{}'::jsonb, 1, true, 'title'),
+    ('slug', 'slug', 'slug', 'Slug', 'Unique public URL slug', true, '{}'::jsonb, 2, true, 'slug'),
+    ('wysiwyg', 'content', 'content', 'Content', 'Main post content', true, '{}'::jsonb, 3, false, 'content'),
+    ('textarea', 'excerpt', 'excerpt', 'Excerpt', 'Short summary for listings', false, '{}'::jsonb, 4, false, 'excerpt'),
+    ('image', 'featured_image', 'featured_image', 'Featured Image', 'Primary post image', false, '{}'::jsonb, 5, false, 'featured_image'),
+    ('text', 'seo_title', 'seo_title', 'SEO Title', 'SEO meta title', false, '{}'::jsonb, 6, false, 'seo_title'),
+    ('textarea', 'seo_description', 'seo_description', 'SEO Description', 'SEO meta description', false, '{}'::jsonb, 7, false, 'seo_description'),
+    ('select', 'status', 'status', 'Status', 'Publication status', true, '{"options":[{"value":"DRAFT","label":"Draft"},{"value":"PUBLISHED","label":"Published"},{"value":"ARCHIVED","label":"Archived"},{"value":"TRASHED","label":"Trash"}]}'::jsonb, 8, false, 'status'),
+    ('user', 'author', 'author', 'Author', 'Post author', true, '{}'::jsonb, 9, false, 'author')
   ) AS v(type, name, key, label, instructions, required, config, sort_order, is_locked, core_field_key)
   ON CONFLICT (key) DO NOTHING
   RETURNING id
@@ -76,15 +68,15 @@ pa_f AS (
     true, v.is_locked, v.core_field_key
   FROM pa
   CROSS JOIN (VALUES
-    ('text', 'title', 'title', 'Título', 'Título da página', true, '{}'::jsonb, 1, true, 'title'),
-    ('slug', 'slug', 'slug', 'Slug', 'URL amigável (único)', true, '{}'::jsonb, 2, true, 'slug'),
-    ('wysiwyg', 'content', 'content', 'Conteúdo', 'Corpo principal da página', true, '{}'::jsonb, 3, false, 'content'),
-    ('textarea', 'excerpt', 'excerpt', 'Resumo', 'Resumo curto para listagens', false, '{}'::jsonb, 4, false, 'excerpt'),
-    ('image', 'featured_image', 'featured_image', 'Imagem Destacada', 'Imagem principal da página', false, '{}'::jsonb, 5, false, 'featured_image'),
-    ('text', 'seo_title', 'seo_title', 'SEO Title', 'Título para SEO (meta title)', false, '{}'::jsonb, 6, false, 'seo_title'),
-    ('textarea', 'seo_description', 'seo_description', 'SEO Description', 'Descrição para SEO (meta description)', false, '{}'::jsonb, 7, false, 'seo_description'),
-    ('select', 'status', 'status', 'Status', 'Status de publicação', true, '{"options":[{"value":"DRAFT","label":"Rascunho"},{"value":"PUBLISHED","label":"Publicado"},{"value":"ARCHIVED","label":"Arquivado"},{"value":"TRASHED","label":"Lixeira"}]}'::jsonb, 8, false, 'status'),
-    ('user', 'author', 'author', 'Autor', 'Autor da página', true, '{}'::jsonb, 9, false, 'author')
+    ('text', 'title', 'page_title', 'Title', 'Page title', true, '{}'::jsonb, 1, true, 'title'),
+    ('slug', 'slug', 'page_slug', 'Slug', 'Unique public URL slug', true, '{}'::jsonb, 2, true, 'slug'),
+    ('wysiwyg', 'content', 'page_content', 'Content', 'Main page content', true, '{}'::jsonb, 3, false, 'content'),
+    ('textarea', 'excerpt', 'page_excerpt', 'Excerpt', 'Short summary for listings', false, '{}'::jsonb, 4, false, 'excerpt'),
+    ('image', 'featured_image', 'page_featured_image', 'Featured Image', 'Primary page image', false, '{}'::jsonb, 5, false, 'featured_image'),
+    ('text', 'seo_title', 'page_seo_title', 'SEO Title', 'SEO meta title', false, '{}'::jsonb, 6, false, 'seo_title'),
+    ('textarea', 'seo_description', 'page_seo_description', 'SEO Description', 'SEO meta description', false, '{}'::jsonb, 7, false, 'seo_description'),
+    ('select', 'status', 'page_status', 'Status', 'Publication status', true, '{"options":[{"value":"DRAFT","label":"Draft"},{"value":"PUBLISHED","label":"Published"},{"value":"ARCHIVED","label":"Archived"},{"value":"TRASHED","label":"Trash"}]}'::jsonb, 8, false, 'status'),
+    ('user', 'author', 'page_author', 'Author', 'Page author', true, '{}'::jsonb, 9, false, 'author')
   ) AS v(type, name, key, label, instructions, required, config, sort_order, is_locked, core_field_key)
   ON CONFLICT (key) DO NOTHING
   RETURNING id
@@ -94,7 +86,9 @@ SELECT 1;
 -- +migrate Down
 DELETE FROM field_definitions WHERE key IN (
   'title', 'slug', 'content', 'excerpt', 'featured_image',
-  'seo_title', 'seo_description', 'status', 'author'
+  'seo_title', 'seo_description', 'status', 'author',
+  'page_title', 'page_slug', 'page_content', 'page_excerpt', 'page_featured_image',
+  'page_seo_title', 'page_seo_description', 'page_status', 'page_author'
 ) AND is_core_field = true;
 
-DELETE FROM field_groups WHERE key IN ('core-fields-post', 'core-fields-page');
+DELETE FROM field_groups WHERE key IN ('core-fields-post', 'core-fields-page');

package/migrations/V024__core__field_group_ownership_and_page_definitions.sql

@@ -0,0 +1,64 @@
+-- +migrate Up
+-- Scope tenant field-group keys and repair page core definitions on upgrades.
+
+ALTER TABLE field_groups DROP CONSTRAINT IF EXISTS field_groups_key_key;
+CREATE UNIQUE INDEX IF NOT EXISTS field_groups_global_key_unique
+  ON field_groups (key) WHERE tenant_id IS NULL;
+CREATE UNIQUE INDEX IF NOT EXISTS field_groups_tenant_key_unique
+  ON field_groups (tenant_id, key) WHERE tenant_id IS NOT NULL;
+
+WITH page_group AS (
+  SELECT id
+  FROM field_groups
+  WHERE key = 'core-fields-page' AND tenant_id IS NULL
+  LIMIT 1
+),
+page_fields(type, name, key, label, instructions, required, config, sort_order, is_locked, core_field_key) AS (
+  VALUES
+    ('text', 'title', 'page_title', 'Title', 'Page title', true, '{}'::jsonb, 1, true, 'title'),
+    ('slug', 'slug', 'page_slug', 'Slug', 'Public URL slug', true, '{}'::jsonb, 2, true, 'slug'),
+    ('wysiwyg', 'content', 'page_content', 'Content', 'Main page content', true, '{}'::jsonb, 3, false, 'content'),
+    ('textarea', 'excerpt', 'page_excerpt', 'Excerpt', 'Short summary for listings', false, '{}'::jsonb, 4, false, 'excerpt'),
+    ('image', 'featured_image', 'page_featured_image', 'Featured Image', 'Primary page image', false, '{}'::jsonb, 5, false, 'featured_image'),
+    ('text', 'seo_title', 'page_seo_title', 'SEO Title', 'SEO title', false, '{}'::jsonb, 6, false, 'seo_title'),
+    ('textarea', 'seo_description', 'page_seo_description', 'SEO Description', 'SEO description', false, '{}'::jsonb, 7, false, 'seo_description'),
+    ('select', 'status', 'page_status', 'Status', 'Publication status', true, '{"options":[{"value":"DRAFT","label":"Draft"},{"value":"PUBLISHED","label":"Published"},{"value":"ARCHIVED","label":"Archived"},{"value":"TRASHED","label":"Trash"}]}'::jsonb, 8, false, 'status'),
+    ('user', 'author', 'page_author', 'Author', 'Page author', true, '{}'::jsonb, 9, false, 'author')
+)
+INSERT INTO field_definitions (
+  group_id, parent_field_id, type, name, key, label, instructions,
+  required, config, sort_order, is_core_field, is_locked, core_field_key
+)
+SELECT page_group.id, NULL, page_fields.type, page_fields.name, page_fields.key,
+       page_fields.label, page_fields.instructions, page_fields.required,
+       page_fields.config, page_fields.sort_order, true,
+       page_fields.is_locked, page_fields.core_field_key
+FROM page_group
+CROSS JOIN page_fields
+WHERE NOT EXISTS (
+  SELECT 1 FROM field_definitions existing
+  WHERE existing.group_id = page_group.id
+    AND existing.core_field_key = page_fields.core_field_key
+)
+ON CONFLICT (key) DO UPDATE SET
+  group_id = EXCLUDED.group_id,
+  name = EXCLUDED.name,
+  label = EXCLUDED.label,
+  instructions = EXCLUDED.instructions,
+  required = EXCLUDED.required,
+  config = EXCLUDED.config,
+  sort_order = EXCLUDED.sort_order,
+  is_core_field = true,
+  is_locked = EXCLUDED.is_locked,
+  core_field_key = EXCLUDED.core_field_key,
+  updated_at = NOW();
+
+-- +migrate Down
+DROP INDEX IF EXISTS field_groups_tenant_key_unique;
+DROP INDEX IF EXISTS field_groups_global_key_unique;
+ALTER TABLE field_groups ADD CONSTRAINT field_groups_key_key UNIQUE (key);
+DELETE FROM field_definitions
+WHERE key IN ('page_title', 'page_slug', 'page_content', 'page_excerpt',
+              'page_featured_image', 'page_seo_title', 'page_seo_description',
+              'page_status', 'page_author')
+  AND is_core_field = true;

package/migrations/V025__core__canonicalize_content_field_values.sql

@@ -0,0 +1,97 @@
+-- +migrate Up
+-- Make body the single canonical content document while preserving legacy
+-- native columns, data, and relational field_values as read-only inputs.
+
+CREATE TABLE IF NOT EXISTS content_value_migration_conflicts (
+  id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
+  content_id UUID NOT NULL REFERENCES content(id) ON DELETE CASCADE,
+  field_name VARCHAR(255) NOT NULL,
+  sources JSONB NOT NULL,
+  created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(),
+  UNIQUE(content_id, field_name)
+);
+
+CREATE INDEX IF NOT EXISTS idx_content_value_migration_conflicts_content
+  ON content_value_migration_conflicts(content_id);
+
+CREATE OR REPLACE FUNCTION okcms_json_object(value jsonb) RETURNS jsonb
+LANGUAGE plpgsql IMMUTABLE AS $$
+BEGIN
+  IF value IS NULL THEN RETURN '{}'::jsonb; END IF;
+  IF jsonb_typeof(value) = 'object' THEN RETURN value; END IF;
+  IF jsonb_typeof(value) = 'string' THEN
+    BEGIN
+      RETURN (value #>> '{}')::jsonb;
+    EXCEPTION WHEN others THEN
+      RETURN '{}'::jsonb;
+    END;
+  END IF;
+  RETURN '{}'::jsonb;
+END;
+$$;
+
+INSERT INTO content_value_migration_conflicts (content_id, field_name, sources)
+SELECT c.id, keys.key,
+       jsonb_build_object('body', body_values->keys.key, 'data', data_values->keys.key)
+FROM content c
+CROSS JOIN LATERAL (SELECT okcms_json_object(c.body) AS body_values,
+                           okcms_json_object(c.data) AS data_values) sources
+CROSS JOIN LATERAL jsonb_object_keys(sources.body_values || sources.data_values) keys(key)
+WHERE sources.body_values ? keys.key
+  AND sources.data_values ? keys.key
+  AND sources.body_values->keys.key IS DISTINCT FROM sources.data_values->keys.key
+ON CONFLICT (content_id, field_name) DO NOTHING;
+
+WITH relational AS (
+  SELECT fv.entity_id,
+         jsonb_object_agg(fd.name, fv.value) AS relational_values
+  FROM field_values fv
+  JOIN field_definitions fd ON fd.id = fv.field_definition_id
+  WHERE fv.entity_type = 'content'
+  GROUP BY fv.entity_id
+), source_values AS (
+  SELECT c.id,
+         jsonb_build_object(
+           'title', c.title,
+           'slug', c.slug,
+           'excerpt', c.excerpt,
+           'featured_image', c.featured_image_id,
+           'seo_title', c.seo_title,
+           'seo_description', c.seo_description,
+           'status', c.status,
+           'author', c.author_id
+         ) || okcms_json_object(c.data) || COALESCE(relational.relational_values, '{}'::jsonb) || okcms_json_object(c.body) AS logical_values
+  FROM content c
+  LEFT JOIN relational ON relational.entity_id = c.id
+)
+UPDATE content c
+SET body = jsonb_strip_nulls(
+  source_values.logical_values
+  || jsonb_build_object(
+    'content', COALESCE(source_values.logical_values->'content', source_values.logical_values->'html')
+  )
+  - 'html' - 'featuredImageId' - 'featured_image_id' - 'seoTitle' - 'seoDescription'
+),
+data = '{}'::jsonb
+FROM source_values
+WHERE source_values.id = c.id;
+
+UPDATE content_versions v
+SET body = jsonb_strip_nulls(
+  jsonb_build_object(
+    'title', v.title,
+    'slug', v.slug,
+    'excerpt', v.excerpt,
+    'featured_image', v.featured_image_id,
+    'seo_title', v.seo_title,
+    'seo_description', v.seo_description
+  ) || okcms_json_object(v.body)
+  - 'html' - 'featuredImageId' - 'featured_image_id' - 'seoTitle' - 'seoDescription'
+);
+
+DROP FUNCTION okcms_json_object(jsonb);
+
+-- +migrate Down
+-- The canonicalization is intentionally one-way. Restore content and
+-- content_versions from the database backup captured before this migration.
+DROP TABLE IF EXISTS content_value_migration_conflicts;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oktis-works/cms",
-  "version": "0.13.7",
+  "version": "0.13.8",
   "private": false,
   "type": "module",
   "main": "./dist/index.js",
@@ -20,12 +20,12 @@
     "clean": "rm -rf dist migrations tsconfig.tsbuildinfo"
   },
   "dependencies": {
-    "@oktis-works/auth": "^0.8.1",
+    "@oktis-works/auth": "^0.8.2",
     "@oktis-works/config": "^0.6.4",
-    "@oktis-works/core": "^0.14.2",
-    "@oktis-works/database": "^0.14.1",
-    "@oktis-works/validation": "^0.7.0",
-    "@oktis-works/theme-runtime": "^0.10.1"
+    "@oktis-works/core": "^0.15.0",
+    "@oktis-works/database": "^0.14.2",
+    "@oktis-works/validation": "^0.8.0",
+    "@oktis-works/theme-runtime": "^0.11.0"
   },
   "devDependencies": {
     "typescript": "5.7.3"