@opengis/cms 0.0.24 → 0.0.27

package/package.json

@@ -1,67 +1,68 @@
-{
-  "name": "@opengis/cms",
-  "version": "0.0.24",
-  "description": "cms",
-  "type": "module",
-  "author": "Softpro",
-  "main": "dist/cms.js",
-  "license": "EULA",
-  "files": [
-    "dist/*",
-    "src/index.js",
-    "server",
-    "plugin.js"
-  ],
-  "scripts": {
-    "test": "node --test test/**/*.test.js",
-    "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
-    "build": "vite build",
-    "proxy": "vite dev",
-    "build-npm": "vite build",
-    "start": "bun --env-file=.env.ip server",
-    "prod-ip1": "node server --config=ip ",
-    "prod-softpro1": "node server --config=softpro",
-    "prod": "NODE_ENV=production bun --env-file=.env.ip  server ",
-    "prod-ip": "PORT=3019 node server --config=ip",
-    "prod-ip-test": "PORT=3025 node server --config=ip",
-    "dev": "node server --config=softpro",
-    "debug": "bun --watch server --config=softpro",
-    "ip-test": "node server --config=ip-test",
-    "ip": "node --env-file=.env.ip server",
-    "demo": "node --env-file=.env.demo --env-file=.env server",
-    "i18n:sync": "node i18n-sync.cjs",
-    "softpro": "bun --env-file=.env.softpro server"
-  },
-  "dependencies": {
-    "@fastify/compress": "^8.1.0",
-    "@opengis/core": "^0.0.30",
-    "@opengis/fastify-table": "^2.0.118",
-    "@opengis/filter": "^0.1.10",
-    "@opengis/form": "^0.0.70",
-    "@opengis/richtext": "0.0.38",
-    "@vueuse/head": "2.0.0",
-    "js-yaml": "^4.1.0",
-    "lucide-vue-next": "0.344.0",
-    "vite": "5.1.4",
-    "vue": "^3.5.17",
-    "vue-i18n": "11.1.5",
-    "vue-router": "4.4.3",
-    "vuedraggable": "4.1.0"
-  },
-  "resolutions": {
-    "rollup": "4.30.0"
-  },
-  "devDependencies": {
-    "@tailwindcss/typography": "0.5.10",
-    "@tsconfig/node22": "^22.0.2",
-    "@vitejs/plugin-vue": "5.0.4",
-    "autoprefixer": "10.4.18",
-    "eslint": "8.49.0",
-    "postcss": "8.4.35",
-    "sass": "^1.92.1",
-    "tailwindcss": "3.4.1",
-    "typescript": "~5.8.0",
-    "vitest": "3.2.4",
-    "vue-tsc": "^2.2.10"
-  }
-}
+{
+  "name": "@opengis/cms",
+  "version": "0.0.27",
+  "description": "cms",
+  "type": "module",
+  "author": "Softpro",
+  "main": "dist/cms.js",
+  "license": "EULA",
+  "files": [
+    "dist",
+    "server",
+    "plugin.js"
+  ],
+  "scripts": {
+    "test": "node --test test/**/*.test.js",
+    "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
+    "build": "vite build",
+    "build:lib": "LIB=true vite build",
+    "proxy": "vite dev",
+    "build-npm": "vite build",
+    "start": "bun --env-file=.env.ip server",
+    "prod-ip1": "node server --config=ip ",
+    "prod-softpro1": "node server --config=softpro",
+    "prod": "NODE_ENV=production bun --env-file=.env.ip  server ",
+    "prod-ip": "PORT=3019 node server --config=ip",
+    "prod-ip-test": "PORT=3025 node server --config=ip",
+    "dev": "node server --config=softpro",
+    "debug": "bun --watch server --config=softpro",
+    "ip-test": "node server --config=ip-test",
+    "ip": "node --env-file=.env.ip server",
+    "demo": "node --env-file=.env.demo --env-file=.env server",
+    "i18n:sync": "node i18n-sync.cjs",
+    "prepublishOnly": "bun build:lib",
+    "softpro": "bun --env-file=.env.softpro server"
+  },
+  "dependencies": {
+    "@fastify/compress": "^8.1.0",
+    "@opengis/core": "^0.0.30",
+    "@opengis/fastify-table": "^2.0.118",
+    "@opengis/filter": "^0.1.10",
+    "@opengis/form": "^0.0.70",
+    "@opengis/richtext": "0.0.38",
+    "@vueuse/head": "2.0.0",
+    "js-yaml": "^4.1.0",
+    "lucide-vue-next": "0.344.0",
+    "vite": "5.1.4",
+    "vue": "^3.5.17",
+    "vue-i18n": "11.1.5",
+    "vue-router": "4.4.3",
+    "vuedraggable": "4.1.0"
+  },
+  "resolutions": {
+    "rollup": "4.30.0"
+  },
+  "devDependencies": {
+    "@tailwindcss/typography": "0.5.10",
+    "@tsconfig/node22": "^22.0.2",
+    "@vitejs/plugin-vue": "5.0.4",
+    "autoprefixer": "10.4.18",
+    "eslint": "8.49.0",
+    "postcss": "8.4.35",
+    "sass": "^1.92.1",
+    "tailwindcss": "3.4.1",
+    "typescript": "~5.8.0",
+    "vitest": "3.2.4",
+    "vue-tsc": "^2.2.10"
+  }
+}

package/plugin.js

@@ -1,76 +1,76 @@
-import path from 'node:path';
-import { fileURLToPath } from 'url';
-import { existsSync, readFileSync } from 'node:fs';
-
-import { config, execMigrations, getPGAsync } from '@opengis/fastify-table/utils.js';
-import { table } from 'node:console';
-
-const dirname = path.dirname(fileURLToPath(import.meta.url));
-
-// node server --config=softpro
-console.log(process.argv);
-if (process.argv.find(el => el.includes('--config'))) {
-  const filename = process.argv.find(el => el.includes('--config')).split('=').pop();
-  const cmsConfig = existsSync(`config/${filename}.json`)
-    ? JSON.parse(readFileSync(`config/${filename}.json`, 'utf8'))
-    : {};
-
-  console.log('cms init', cmsConfig.pg?.database);
-  Object.keys(cmsConfig).forEach(key => {
-    config[key] = cmsConfig[key];
-  });
-  config.spacename = 'default' || cmsConfig.name || filename;
-} else {
-  config.spacename = 'default' || config.spacename || process.env.NODE_ENV; // --env.file=.env.ip
-}
-
-const { prefix = '/api' } = config;
-
-export default async function (app) {
-  app.register(import('./server/routes/menu/index.mjs'), { prefix });
-  app.register(import('./server/routes/migration/index.mjs'), { prefix });
-  app.register(import('./server/routes/cms/index.mjs'), { prefix });
-  app.register(import('./server/routes/cmsSpace/index.mjs'), { prefix });
-  app.register(import('./server/routes/contentType/index.mjs'), { prefix });
-  app.register(import('./server/routes/category/index.mjs'), { prefix });
-  app.register(import('./server/routes/tags/index.mjs'), { prefix });
-  app.register(import('./server/routes/logs/index.mjs'), { prefix });
-  app.register(import('./server/routes/feedback/index.mjs'), { prefix });
-  const pg = await getPGAsync(config.pg);
-  execMigrations(path.join(dirname, 'server/migrations'), pg).catch(err => console.log(err));
-  if (pg?.pk?.['site.content_types']) {
-    const customTables = await pg.query('select array_agg(table_name) from site.content_types where table_name is not null').then(el => el.rows?.[0]?.array_agg || []).catch(err => console.log(err));
-
-    await Promise.all(customTables.filter(table => pg.pk?.[`data.${table}`])?.map(async (table) => {
-      await pg.query(`alter table data.${table} add column if not exists meta json`).catch(err => console.log(err));
-      await pg.query(`alter table data.${table} add column if not exists main_image text`).catch(err => console.log(err));
-      await pg.query(`update site.content_types
-      SET columns = columns::jsonb || jsonb_build_object('name', 'main_image', 'type', 'image', 'label', 'Зображення')
-      WHERE not EXISTS (
-        SELECT 1
-        FROM jsonb_array_elements(columns::jsonb) AS obj(elem)
-        JOIN LATERAL jsonb_each_text(elem) AS kv(key, value) ON true
-        WHERE key = 'name' and value='main_image'
-      )`);
-      await pg.query(`alter table data.${table} add column if not exists published_at timestamp without time zone not null default now()`).catch(err => console.log(err));
-      await pg.query(`alter table data.${table} add column if not exists is_pin boolean DEFAULT false`).catch(err => console.log(err));
-      await pg.query(`alter table data.${table} drop column if exists publish_at`).catch(err => console.log(err));
-    }));
-
-
-
-    /*customTables.filter(table => pg.pk?.[`data.${table}`])?.forEach(table => pg.query(`alter table data.${table} add column if not exists meta json`).catch(err => console.log(err)));
-    customTables.filter(table => pg.pk?.[`data.${table}`])?.forEach(table => pg.query(`alter table data.${table} add column if not exists published_at timestamp without time zone not null default now()`).catch(err => console.log(err)));
-    customTables.filter(table => pg.pk?.[`data.${table}`])?.forEach(table => pg.query(`alter table data.${table} add column if not exists is_pin boolean DEFAULT false`).catch(err => console.log(err)));*/
-
-
-  }
-  /* if (pg?.pk?.['site.content_types'] && pg?.pk?.['site.contents']) {
-    await pg.query('insert into site.contents(content_type_id, space_id, locale) select content_type_id, $1, $2 from site.content_types where content_type_id not in (select content_type_id from site.contents)', [config.spacename || 'default', config.locale || 'ua']).catch(err => {
-      console.log(err.toString());
-    });
-  }
-  if (pg?.pk?.['site.spaces']) {
-    pg.query('insert into site.spaces(space_id, name) values($1, $1) on conflict(space_id) do nothing', [config.spacename || 'default']).catch(err => console.error('spaces insert error', err.toString())); // for content site.spaces
-  } */
-}
+import path from 'node:path';
+import { fileURLToPath } from 'url';
+import { existsSync, readFileSync } from 'node:fs';
+
+import { config, execMigrations, getPGAsync } from '@opengis/fastify-table/utils.js';
+import { table } from 'node:console';
+
+const dirname = path.dirname(fileURLToPath(import.meta.url));
+
+// node server --config=softpro
+console.log(process.argv);
+if (process.argv.find(el => el.includes('--config'))) {
+  const filename = process.argv.find(el => el.includes('--config')).split('=').pop();
+  const cmsConfig = existsSync(`config/${filename}.json`)
+    ? JSON.parse(readFileSync(`config/${filename}.json`, 'utf8'))
+    : {};
+
+  console.log('cms init', cmsConfig.pg?.database);
+  Object.keys(cmsConfig).forEach(key => {
+    config[key] = cmsConfig[key];
+  });
+  config.spacename = 'default' || cmsConfig.name || filename;
+} else {
+  config.spacename = 'default' || config.spacename || process.env.NODE_ENV; // --env.file=.env.ip
+}
+
+const { prefix = '/api' } = config;
+
+export default async function (app) {
+  app.register(import('./server/routes/menu/index.mjs'), { prefix });
+  app.register(import('./server/routes/migration/index.mjs'), { prefix });
+  app.register(import('./server/routes/cms/index.mjs'), { prefix });
+  app.register(import('./server/routes/cmsSpace/index.mjs'), { prefix });
+  app.register(import('./server/routes/contentType/index.mjs'), { prefix });
+  app.register(import('./server/routes/category/index.mjs'), { prefix });
+  app.register(import('./server/routes/tags/index.mjs'), { prefix });
+  app.register(import('./server/routes/logs/index.mjs'), { prefix });
+  app.register(import('./server/routes/feedback/index.mjs'), { prefix });
+  const pg = await getPGAsync(config.pg);
+  execMigrations(path.join(dirname, 'server/migrations'), pg).catch(err => console.log(err));
+  if (pg?.pk?.['site.content_types']) {
+    const customTables = await pg.query('select array_agg(table_name) from site.content_types where table_name is not null').then(el => el.rows?.[0]?.array_agg || []).catch(err => console.log(err));
+
+    await Promise.all(customTables.filter(table => pg.pk?.[`data.${table}`])?.map(async (table) => {
+      await pg.query(`alter table data.${table} add column if not exists meta json`).catch(err => console.log(err));
+      await pg.query(`alter table data.${table} add column if not exists main_image text`).catch(err => console.log(err));
+      await pg.query(`update site.content_types
+      SET columns = columns::jsonb || jsonb_build_object('name', 'main_image', 'type', 'image', 'label', 'Зображення')
+      WHERE not EXISTS (
+        SELECT 1
+        FROM jsonb_array_elements(columns::jsonb) AS obj(elem)
+        JOIN LATERAL jsonb_each_text(elem) AS kv(key, value) ON true
+        WHERE key = 'name' and value='main_image'
+      )`);
+      await pg.query(`alter table data.${table} add column if not exists published_at timestamp without time zone not null default now()`).catch(err => console.log(err));
+      await pg.query(`alter table data.${table} add column if not exists is_pin boolean DEFAULT false`).catch(err => console.log(err));
+      await pg.query(`alter table data.${table} drop column if exists publish_at`).catch(err => console.log(err));
+    }));
+
+
+
+    /*customTables.filter(table => pg.pk?.[`data.${table}`])?.forEach(table => pg.query(`alter table data.${table} add column if not exists meta json`).catch(err => console.log(err)));
+    customTables.filter(table => pg.pk?.[`data.${table}`])?.forEach(table => pg.query(`alter table data.${table} add column if not exists published_at timestamp without time zone not null default now()`).catch(err => console.log(err)));
+    customTables.filter(table => pg.pk?.[`data.${table}`])?.forEach(table => pg.query(`alter table data.${table} add column if not exists is_pin boolean DEFAULT false`).catch(err => console.log(err)));*/
+
+
+  }
+  /* if (pg?.pk?.['site.content_types'] && pg?.pk?.['site.contents']) {
+    await pg.query('insert into site.contents(content_type_id, space_id, locale) select content_type_id, $1, $2 from site.content_types where content_type_id not in (select content_type_id from site.contents)', [config.spacename || 'default', config.locale || 'ua']).catch(err => {
+      console.log(err.toString());
+    });
+  }
+  if (pg?.pk?.['site.spaces']) {
+    pg.query('insert into site.spaces(space_id, name) values($1, $1) on conflict(space_id) do nothing', [config.spacename || 'default']).catch(err => console.error('spaces insert error', err.toString())); // for content site.spaces
+  } */
+}

package/server/app.js

@@ -1,35 +1,35 @@
-import { config, addHook } from '@opengis/fastify-table/utils.js';
-
-config.rateLimit = false;
-config.prefix = config.prefix || '/api';
-config.mode = config.mode || 'cms';
-// config.auth.oneUser = true;
-config.auth = config.auth || {};
-config.auth['2fa'] = config.auth['2fa'] || {};
-config.auth['2fa'].prefix = config.auth['2fa'].prefix || 'cms';
-config.auth['2fa'].sufix = config.auth['2fa'].sufix || 'login';
-
-// when frontend is implemented/used
-// config.auth.loginPage = true; // disable core loginPage api, use vue component instead
-// config.auth.link = config.auth.link || { '2fa': { login: '/2fa' } };
-
-export default async function (app) {
-  // core
-  app.register(import('@fastify/compress'), { encodings: ['br', 'gzip'], });
-  app.register(import('./plugins/adminHook.js'));
-  app.register(import('./plugins/hook.js'));
-
-  app.register(import('@opengis/fastify-table'), config);
-
-  app.register(import('./plugins/vite.js'));
-  // API
-  app.register(import('./routes/root.mjs'));
-  app.register(import('../plugin.js'));
-
-  addHook('errorMessage', (params) => {
-    if (params?.constraint && params.constraint === 'content_data_content_id_fkey') {
-      return 'Перед видаленням даного типу контенту, необхідно видалити всі дані, що до нього відносяться.';
-    }
-    return params?.message || 'Помилка API';
-  });
-}
+import { config, addHook } from '@opengis/fastify-table/utils.js';
+
+config.rateLimit = false;
+config.prefix = config.prefix || '/api';
+config.mode = config.mode || 'cms';
+// config.auth.oneUser = true;
+config.auth = config.auth || {};
+config.auth['2fa'] = config.auth['2fa'] || {};
+config.auth['2fa'].prefix = config.auth['2fa'].prefix || 'cms';
+config.auth['2fa'].sufix = config.auth['2fa'].sufix || 'login';
+
+// when frontend is implemented/used
+// config.auth.loginPage = true; // disable core loginPage api, use vue component instead
+// config.auth.link = config.auth.link || { '2fa': { login: '/2fa' } };
+
+export default async function (app) {
+  // core
+  app.register(import('@fastify/compress'), { encodings: ['br', 'gzip'], });
+  app.register(import('./plugins/adminHook.js'));
+  app.register(import('./plugins/hook.js'));
+
+  app.register(import('@opengis/fastify-table'), config);
+
+  app.register(import('./plugins/vite.js'));
+  // API
+  app.register(import('./routes/root.mjs'));
+  app.register(import('../plugin.js'));
+
+  addHook('errorMessage', (params) => {
+    if (params?.constraint && params.constraint === 'content_data_content_id_fkey') {
+      return 'Перед видаленням даного типу контенту, необхідно видалити всі дані, що до нього відносяться.';
+    }
+    return params?.message || 'Помилка API';
+  });
+}

package/server/config.js

@@ -1,5 +1,5 @@
-import { readFile } from 'fs/promises';
-import fs from 'fs';
-const config = fs.existsSync('config.json') ? JSON.parse(await readFile('config.json')) : {};
-
+import { readFile } from 'fs/promises';
+import fs from 'fs';
+const config = fs.existsSync('config.json') ? JSON.parse(await readFile('config.json')) : {};
+
 export default config;

package/server/functions/getDraftKey.js

@@ -1,22 +1,22 @@
-import { randomUUID } from "node:crypto";
-
-import { config, getRedis } from "@opengis/fastify-table/utils.js";
-
-const rclient = getRedis();
-const redisKey = [config.pg?.database, "draftKey"].filter(Boolean).join(":");
-
-// allow users to view content in draft status if passed as query param
-export default async function getDraftKey(nocache = false) {
-  const cacheKey = await rclient.get(redisKey);
-  const ttl = await rclient.ttl(redisKey) || 0;
-
-  if (cacheKey && !nocache) {
-    return { draftKey: cacheKey, ttl: (ttl / 60).toFixed(0) + " minutes" };
-  }
-
-  const draftKey = randomUUID().replace(/-/g, "").substring(0, 10);
-
-  // refresh every hour
-  await rclient.set(redisKey, draftKey, "EX", 60 * 60);
-  return { draftKey };
-}
+import { randomUUID } from "node:crypto";
+
+import { config, getRedis } from "@opengis/fastify-table/utils.js";
+
+const rclient = getRedis();
+const redisKey = [config.pg?.database, "draftKey"].filter(Boolean).join(":");
+
+// allow users to view content in draft status if passed as query param
+export default async function getDraftKey(nocache = false) {
+  const cacheKey = await rclient.get(redisKey);
+  const ttl = await rclient.ttl(redisKey) || 0;
+
+  if (cacheKey && !nocache) {
+    return { draftKey: cacheKey, ttl: (ttl / 60).toFixed(0) + " minutes" };
+  }
+
+  const draftKey = randomUUID().replace(/-/g, "").substring(0, 10);
+
+  // refresh every hour
+  await rclient.set(redisKey, draftKey, "EX", 60 * 60);
+  return { draftKey };
+}

package/server/index.js

@@ -1,22 +1,22 @@
-import Fastify from 'fastify';
-
-import appService from './app.js';
-
-import { config, logger } from '@opengis/fastify-table/utils.js';
-
-// Instantiate Fastify with some config
-const app = Fastify({ loggerInstance: logger, maxParamLength: config.maxParamLength || 500 });
-
-// Register your application as a normal plugin.
-
-app.register(appService);
-
-process.env.PORT = process.env.PORT || config.port || 3000;
-// Start listening.
-app.listen({ host: '0.0.0.0', port: process.env.PORT }, (err) => {
-  if (err) {
-    console.error(err.toString());
-    logger.error(err);
-    process.exit(1);
-  }
-});
+import Fastify from 'fastify';
+
+import appService from './app.js';
+
+import { config, logger } from '@opengis/fastify-table/utils.js';
+
+// Instantiate Fastify with some config
+const app = Fastify({ loggerInstance: logger, maxParamLength: config.maxParamLength || 500 });
+
+// Register your application as a normal plugin.
+
+app.register(appService);
+
+process.env.PORT = process.env.PORT || config.port || 3000;
+// Start listening.
+app.listen({ host: '0.0.0.0', port: process.env.PORT }, (err) => {
+  if (err) {
+    console.error(err.toString());
+    logger.error(err);
+    process.exit(1);
+  }
+});