@opengis/fastify-table 1.2.19 → 1.2.21

package/index.js

@@ -1,79 +1,82 @@
-import path from 'node:path';
-import fp from 'fastify-plugin';
-import { fileURLToPath } from 'node:url';
-
-import config from './config.js';
-
-// plugins
-import cronPlugin from './server/plugins/cron/index.js';
-import crudPlugin from './server/plugins/crud/index.js';
-// hook, logger, migration - utils only
-import pgPlugin from './server/plugins/pg/index.js';
-import policyPlugin from './server/plugins/policy/index.js';
-import redisPlugin from './server/plugins/redis/index.js';
-import tablePlugin from './server/plugins/table/index.js';
-import utilPlugin from './server/plugins/util/index.js';
-import loggerPlugin from './server/plugins/logger/index.js';
-
-// routes
-import cronRoutes from './server/routes/cron/index.js';
-import crudRoutes from './server/routes/crud/index.js';
-import loggerRoutes from './server/routes/logger/index.js';
-import propertiesRoutes from './server/routes/properties/index.js';
-import tableRoutes from './server/routes/table/index.js';
-import utilRoutes from './server/routes/util/index.js';
-
-import {
-  addTemplateDir, execMigrations,
-} from './utils.js';
-
-async function plugin(fastify, opt) {
-  config.pg = opt.pg;
-  config.redis = opt.redis;
-  config.root = opt.root;
-  config.mapServerRoot = opt.mapServerRoot;
-
-  // independent npm start / unit test
-  if (!fastify.config) {
-    fastify.decorate('config', config);
-  }
-
-  fastify.register(import('@fastify/sensible'), {
-    errorHandler: false,
-  });
-
-  fastify.register(import('@fastify/url-data'), {
-    errorHandler: false,
-  });
-
-  fastify.register(import('@opengis/fastify-hb'));
-
-  const filename = fileURLToPath(import.meta.url);
-  const cwd = path.dirname(filename);
-
-  // core migrations (second argument for core only)
-  execMigrations(path.join(cwd, 'server/migrations'), true).catch(err => console.log(err));
-
-  // core templates && cls
-  config.templates?.forEach(el => addTemplateDir(el));
-  addTemplateDir(path.join(cwd, 'module/core'));
-
-  // plugins / utils / funcs
-  policyPlugin(fastify);
-  redisPlugin(fastify);
-  await pgPlugin(fastify, opt);
-  tablePlugin(fastify, opt);
-  crudPlugin(fastify, opt);
-  utilPlugin(fastify, opt);
-  cronPlugin(fastify, opt);
-  loggerPlugin(fastify, opt);
-
-  // routes / api
-  cronRoutes(fastify, opt);
-  crudRoutes(fastify, opt);
-  loggerRoutes(fastify, opt);
-  propertiesRoutes(fastify, opt);
-  tableRoutes(fastify, opt);
-  utilRoutes(fastify, opt);
-}
-export default fp(plugin);
+import path from 'node:path';
+import fp from 'fastify-plugin';
+import { fileURLToPath } from 'node:url';
+
+import config from './config.js';
+
+// plugins
+import cronPlugin from './server/plugins/cron/index.js';
+import crudPlugin from './server/plugins/crud/index.js';
+// hook, logger, migration - utils only
+import pgPlugin from './server/plugins/pg/index.js';
+import policyPlugin from './server/plugins/policy/index.js';
+import metricPlugin from './server/plugins/metric/index.js';
+import redisPlugin from './server/plugins/redis/index.js';
+import tablePlugin from './server/plugins/table/index.js';
+import utilPlugin from './server/plugins/util/index.js';
+import loggerPlugin from './server/plugins/logger/index.js';
+
+// routes
+import cronRoutes from './server/routes/cron/index.js';
+import crudRoutes from './server/routes/crud/index.js';
+import loggerRoutes from './server/routes/logger/index.js';
+import propertiesRoutes from './server/routes/properties/index.js';
+import tableRoutes from './server/routes/table/index.js';
+import utilRoutes from './server/routes/util/index.js';
+
+import {
+  addTemplateDir, execMigrations,
+} from './utils.js';
+
+// core templates && cls
+const filename = fileURLToPath(import.meta.url);
+const cwd = path.dirname(filename);
+
+async function plugin(fastify, opt) {
+  config.pg = opt.pg;
+  config.redis = opt.redis;
+  config.root = opt.root;
+  config.mapServerRoot = opt.mapServerRoot;
+
+  // independent npm start / unit test
+  if (!fastify.config) {
+    fastify.decorate('config', config);
+  }
+
+  fastify.register(import('@fastify/sensible'), {
+    errorHandler: false,
+  });
+
+  fastify.register(import('@fastify/url-data'), {
+    errorHandler: false,
+  });
+
+  fastify.register(import('@opengis/fastify-hb'));
+
+  // core migrations (second argument for core only)
+  execMigrations(path.join(cwd, 'server/migrations'), true).catch(err => console.log(err));
+
+  // core templates && cls
+  config.templates?.forEach(el => addTemplateDir(el));
+  addTemplateDir(path.join(cwd, 'module/core'));
+
+  // plugins / utils / funcs
+  policyPlugin(fastify);
+  metricPlugin(fastify);
+  redisPlugin(fastify);
+  await pgPlugin(fastify, opt);
+  tablePlugin(fastify, opt);
+  crudPlugin(fastify, opt);
+  utilPlugin(fastify, opt);
+  cronPlugin(fastify, opt);
+  loggerPlugin(fastify, opt);
+
+  // routes / api
+  cronRoutes(fastify, opt);
+  crudRoutes(fastify, opt);
+  loggerRoutes(fastify, opt);
+  propertiesRoutes(fastify, opt);
+  tableRoutes(fastify, opt);
+  utilRoutes(fastify, opt);
+}
+export default fp(plugin);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.2.19",
+  "version": "1.2.21",
   "type": "module",
   "description": "core-plugins",
   "keywords": [

package/server/migrations/0.sql

@@ -1,84 +1,84 @@
--- fix error if function exists and return type not text i.e bigint
-
-do $$
-
-declare
-m record;
-_pk text;
-_tables json;
-_returnType text;
-
-begin
-
-select format_type(p.prorettype, null) as return_type
-from pg_proc p
-where p.proname = 'next_id'
-and p.pronamespace = 'public'::regnamespace into _returnType;
-
-if (_returnType != 'text') then
-	raise notice 'default reassign start: % -> text', _returnType;
-
-	CREATE EXTENSION if not exists "uuid-ossp";
-
-	SELECT json_object_agg(a.attrelid::regclass, a.attname)
-	FROM   pg_catalog.pg_attribute    a
-	LEFT   JOIN pg_catalog.pg_attrdef d ON (a.attrelid, a.attnum) = (d.adrelid, d.adnum)
-	WHERE  NOT a.attisdropped           -- no dropped (dead) columns
-	AND    a.attnum   > 0               -- no system columns
-	AND pg_get_expr(d.adbin, d.adrelid) = 'next_id()' into _tables;
-
-	FOR m in (select json_object_keys(_tables) as table) loop
-		_pk = _tables->>m.table;
-		raise notice 'drop default: %,%', m.table, _pk;
-		EXECUTE('alter table '|| m.table || ' alter column ' || _pk || ' set default null;');
-	end loop;
-
-	DROP FUNCTION IF EXISTS next_id();
-
-	/* CREATE EXTENSION if not exists "uuid-ossp";
-	ALTER EXTENSION "uuid-ossp" SET SCHEMA public; */
-
-	CREATE OR REPLACE FUNCTION next_id()
-	  RETURNS text AS
-	$BODY$
-	DECLARE
-
-	BEGIN
-	    -- return replace(public.uuid_generate_v4()::text, '-', '');
-		-- return replace(gen_random_uuid()::text, '-', ''); -- native from postgres 13 onward
-		return encode(public.gen_random_bytes(6), 'hex');
-	END;
-	$BODY$
-	  LANGUAGE plpgsql VOLATILE
-	  COST 100;
-
-	FOR m in (select json_object_keys(_tables) as table) loop
-		_pk = _tables->>m.table;
-		raise notice 'reassign default: %, %', m.table, _pk;
-		EXECUTE('alter table '|| m.table || ' alter column ' || _pk || ' set default next_id();');
-	end loop;
-
-	raise notice 'reassign default finish: %', _tables;
-	
-else 
-	raise notice 'skip default reassign';
-
-		/* CREATE EXTENSION if not exists "uuid-ossp";
-		ALTER EXTENSION "uuid-ossp" SET SCHEMA public; */
-
-	CREATE OR REPLACE FUNCTION next_id()
-	  RETURNS text AS
-	$BODY$
-	DECLARE
-
-	BEGIN
-	    -- return replace(public.uuid_generate_v4()::text, '-', '');
-		-- return replace(gen_random_uuid()::text, '-', ''); -- native from postgres 13 onward
-		return encode(public.gen_random_bytes(6), 'hex');
-	END;
-	$BODY$
-	  LANGUAGE plpgsql VOLATILE
-	  COST 100;
-end if;
-
-end $$
+-- fix error if function exists and return type not text i.e bigint
+
+do $$
+
+declare
+m record;
+_pk text;
+_tables json;
+_returnType text;
+
+begin
+
+select format_type(p.prorettype, null) as return_type
+from pg_proc p
+where p.proname = 'next_id'
+and p.pronamespace = 'public'::regnamespace into _returnType;
+
+if (_returnType != 'text') then
+	raise notice 'default reassign start: % -> text', _returnType;
+
+	CREATE EXTENSION if not exists "uuid-ossp";
+
+	SELECT json_object_agg(a.attrelid::regclass, a.attname)
+	FROM   pg_catalog.pg_attribute    a
+	LEFT   JOIN pg_catalog.pg_attrdef d ON (a.attrelid, a.attnum) = (d.adrelid, d.adnum)
+	WHERE  NOT a.attisdropped           -- no dropped (dead) columns
+	AND    a.attnum   > 0               -- no system columns
+	AND pg_get_expr(d.adbin, d.adrelid) = 'next_id()' into _tables;
+
+	FOR m in (select json_object_keys(_tables) as table) loop
+		_pk = _tables->>m.table;
+		raise notice 'drop default: %,%', m.table, _pk;
+		EXECUTE('alter table '|| m.table || ' alter column ' || _pk || ' set default null;');
+	end loop;
+
+	DROP FUNCTION IF EXISTS next_id();
+
+	/* CREATE EXTENSION if not exists "uuid-ossp";
+	ALTER EXTENSION "uuid-ossp" SET SCHEMA public; */
+
+	CREATE OR REPLACE FUNCTION next_id()
+	  RETURNS text AS
+	$BODY$
+	DECLARE
+
+	BEGIN
+	    -- return replace(public.uuid_generate_v4()::text, '-', '');
+		-- return replace(gen_random_uuid()::text, '-', ''); -- native from postgres 13 onward
+		return encode(public.gen_random_bytes(6), 'hex');
+	END;
+	$BODY$
+	  LANGUAGE plpgsql VOLATILE
+	  COST 100;
+
+	FOR m in (select json_object_keys(_tables) as table) loop
+		_pk = _tables->>m.table;
+		raise notice 'reassign default: %, %', m.table, _pk;
+		EXECUTE('alter table '|| m.table || ' alter column ' || _pk || ' set default next_id();');
+	end loop;
+
+	raise notice 'reassign default finish: %', _tables;
+	
+else 
+	raise notice 'skip default reassign';
+
+		/* CREATE EXTENSION if not exists "uuid-ossp";
+		ALTER EXTENSION "uuid-ossp" SET SCHEMA public; */
+
+	CREATE OR REPLACE FUNCTION next_id()
+	  RETURNS text AS
+	$BODY$
+	DECLARE
+
+	BEGIN
+	    -- return replace(public.uuid_generate_v4()::text, '-', '');
+		-- return replace(gen_random_uuid()::text, '-', ''); -- native from postgres 13 onward
+		return encode(public.gen_random_bytes(6), 'hex');
+	END;
+	$BODY$
+	  LANGUAGE plpgsql VOLATILE
+	  COST 100;
+end if;
+
+end $$