@opengis/fastify-table 2.0.116 → 2.0.118

package/dist/helper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helper.d.ts","sourceRoot":"","sources":["../helper.ts"],"names":[],"mappings":"AAGA,OAAO,MAAM,MAAM,aAAa,CAAC;AAGjC,OAAO,EAAE,SAAS,EAAkB,MAAM,YAAY,CAAC;AAEvD,QAAA,MAAQ,MAAM,KAAoB,CAAC;AAInC,wBAAsB,KAAK,kBAI1B;AAGD,wBAAsB,QAAQ,kBAW7B;AAED,wBAAgB,KAAK,QAQpB;AAED,OAAO,EAEL,MAAM,EACN,MAAM,EACN,SAAS,GACV,CAAC"}
+{"version":3,"file":"helper.d.ts","sourceRoot":"","sources":["../helper.ts"],"names":[],"mappings":"AAGA,OAAO,MAAM,MAAM,aAAa,CAAC;AAGjC,OAAO,EAAE,SAAS,EAAkB,MAAM,YAAY,CAAC;AAEvD,QAAA,MAAQ,MAAM,KAAoB,CAAC;AAInC,wBAAsB,KAAK,kBAI1B;AAGD,wBAAsB,QAAQ,kBAW7B;AAED,wBAAgB,KAAK,QAWpB;AAED,OAAO,EAEL,MAAM,EACN,MAAM,EACN,SAAS,GACV,CAAC"}

package/dist/helper.js

@@ -24,6 +24,9 @@ export function build() {
     if (!app) {
         app = Fastify({ logger: false });
         app.register(appService, config);
+        app.addHook("onRequest", async (req) => {
+            req.user = req.user || { uid: "1", user_type: "admin" };
+        });
         addTemplateDir(path.join(process.cwd(), "module/test"));
         // await app.ready(); // ? ensure plugins registered, can not add fastify hooks after app is ready
     }

package/dist/server/plugins/auth/index.js

@@ -10,7 +10,7 @@ const { prefix = "/api" } = config;
 export async function onRequest(req, reply) {
     const { hostname, headers, routeOptions } = req;
     const { config: routeConfig, method, handler, url } = routeOptions || {};
-    const { policy } = routeConfig;
+    const { policy } = routeConfig || {};
     const isApi = method && url && typeof handler === "function" && url !== "*";
     // handle non-api at vite/vike
     if (!isApi) {

package/dist/server/routes/auth/controllers/core/getUserInfo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getUserInfo.d.ts","sourceRoot":"","sources":["../../../../../../server/routes/auth/controllers/core/getUserInfo.ts"],"names":[],"mappings":"AAiCA,wBAA8B,WAAW,CAAC,GAAG,EAAE,GAAG,eA4DjD"}
+{"version":3,"file":"getUserInfo.d.ts","sourceRoot":"","sources":["../../../../../../server/routes/auth/controllers/core/getUserInfo.ts"],"names":[],"mappings":"AAiCA,wBAA8B,WAAW,CAAC,GAAG,EAAE,GAAG,eAkEjD"}

package/dist/server/routes/auth/controllers/core/getUserInfo.js

@@ -45,7 +45,15 @@ export default async function getUserInfo(req) {
     }
     const userInfo = Object.fromEntries(Object.entries(req.user).filter(([key]) => !["salt", "password"].includes(key)));
     const { rows = [] } = req.pg?.pk?.["admin.properties"]
-        ? await req.pg.query(`select property_key as key,property_text as val from admin.properties where property_key~'^(${config.settingKeys || "site|map|admin"})'`)
+        ? await req.pg.query(`select 
+        property_key as key, 
+        case
+          when property_text is not null then to_jsonb(property_text)
+          when property_int is not null then to_jsonb(property_int) 
+          when property_json is not null then property_json::jsonb 
+        end as val 
+        from admin.properties 
+        where property_key~'^(${config.settingKeys || "site|map|admin"})'`)
         : {};
     const settings = rows.reduce((p, { key, val }) => {
         const [k1, k2] = key.split(".");

package/dist/server/routes/auth/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/routes/auth/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAmC1C,iBAAS,MAAM,CAAC,GAAG,EAAE,eAAe,EAAE,GAAG,GAAE,GAAQ,QAiFlD;AAED,eAAe,MAAM,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/routes/auth/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAkD1C,iBAAS,MAAM,CAAC,GAAG,EAAE,eAAe,EAAE,GAAG,GAAE,GAAQ,QAqFlD;AAED,eAAe,MAAM,CAAC"}

package/dist/server/routes/auth/index.js

@@ -21,6 +21,19 @@ import oauthAuthorize from "./controllers/jwt/authorize.js";
 import oauthToken from "./controllers/jwt/token.js";
 import qrCode from "./controllers/2factor/qrcode.js";
 const params = { config: { policy: "L0" } };
+const registrationSchema = {
+    body: {
+        type: "object",
+        required: ["password"],
+        properties: {
+            password: { type: "string", minLength: 6, maxLength: 100 },
+            email: { type: "string", format: "email" },
+            login: { type: "string" },
+            first_name: { type: "string" },
+            last_name: { type: "string" },
+        },
+    },
+};
 function plugin(app, opt = {}) {
     if (opt.routes === false || config.auth?.customRoutes) {
         return;
@@ -35,7 +48,7 @@ function plugin(app, opt = {}) {
         app.post("/api/login", params, login);
     }
     if (!app.hasRoute({ method: "POST", url: "/api/registration" })) {
-        app.post("/api/registration", params, registration);
+        app.post("/api/registration", { ...params, schema: registrationSchema }, registration);
     }
     if (!app.hasRoute({ method: "POST", url: "/api/recovery" })) {
         app.post("/api/recovery", params, passwordRecovery);

package/dist/server/routes/file/controllers/resizeAll.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resizeAll.d.ts","sourceRoot":"","sources":["../../../../../server/routes/file/controllers/resizeAll.ts"],"names":[],"mappings":"AAiHA,wBAA8B,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,gBAoH3D"}
+{"version":3,"file":"resizeAll.d.ts","sourceRoot":"","sources":["../../../../../server/routes/file/controllers/resizeAll.ts"],"names":[],"mappings":"AAkHA,wBAA8B,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,gBAsH3D"}

package/dist/server/routes/file/controllers/resizeAll.js

@@ -4,7 +4,7 @@ import { pgClients, eventStream, logger, isFileExists, downloadFile, uploadFile,
 import grpc from "../../../plugins/grpc/grpc.js";
 import { images } from "../../../plugins/file/utils/allowedExtensions.js";
 const { resizeImage } = grpc();
-async function resizeOne({ relpath: relpath1, resizeQuality = 80, maxWidth = 2048, errors = [], success = [], notfound = [], equalwidth = [], send = () => { }, unittest, }) {
+async function resizeOne({ relpath: relpath1, resizeQuality = 80, maxWidth = 2048, errors = [], success = [], notfound = [], equalwidth = [], send = () => { }, }) {
     const exists = await isFileExists(relpath1);
     const existsOriginal = await isFileExists(relpath1.replace("files/", "files/original/"));
     const relpath = existsOriginal
@@ -42,6 +42,7 @@ async function resizeOne({ relpath: relpath1, resizeQuality = 80, maxWidth = 204
     const resizeHeight = resizeWidth / ratio;
     send(`original ${relpath} width/height/ratio: ${width} / ${height} / ${ratio}`);
     send(`resize ${relpath} width/height/ratio/quality: ${resizeWidth} / ${resizeHeight} / ${resizeWidth / resizeHeight} / ${resizeQuality}`);
+    const unittest = process.env.NODE_ENV === "test" || process.env.VITEST;
     // skip for resize with small unit test image
     if (resizeWidth === width && !unittest) {
         send(`resize ${relpath} skip: resize width equals to original`);
@@ -60,7 +61,7 @@ async function resizeOne({ relpath: relpath1, resizeQuality = 80, maxWidth = 204
     return null;
 }
 export default async function resizeAll(req, reply) {
-    const { pg = pgClients.client, query = {}, unittest } = req;
+    const { pg = pgClients.client, query = {} } = req;
     const { nocache, filepath, quality = 80, limit, sql, w = 2048 } = query;
     if (nocache) {
         const clearQ = `update crm.files set resized=null 
@@ -87,7 +88,9 @@ export default async function resizeAll(req, reply) {
     const errors = [];
     const notfound = [];
     const equalwidth = [];
-    const send = unittest ? console.log : eventStream(reply);
+    const send = process.env.NODE_ENV === "test" || process.env.VITEST
+        ? console.log
+        : eventStream(reply);
     try {
         send(`file max resize width: ${w}`);
         send(`file max resize quality: ${resizeQuality}`);
@@ -104,7 +107,6 @@ export default async function resizeAll(req, reply) {
             notfound,
             equalwidth,
             send,
-            unittest,
         })), Promise.resolve());
         if (success.length) {
             await pg.query("update crm.files set resized=true where file_path=any($1::text[])", [success]);

package/dist/server/routes/table/functions/getData.js

@@ -395,7 +395,7 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
             from (select * ${sql
         ?.filter((el) => el.inline)
         .map((el) => `,(${el.sql})`)
-        .join("") || ""} from ${viewSql ? `(${viewSql})` : table1} t ${sqlTable})q 
+        .join("") || ""} from ${viewSql ? `(${viewSql})` : table1} t ${sqlTable})t 
             where ${[loadTable?.query, tokenData?.query, accessQuery, contextQuery]
         .filter(Boolean)
         .filter((el) => checkQuery(el))

package/package.json

@@ -1,93 +1,93 @@
-{
-  "name": "@opengis/fastify-table",
-  "version": "2.0.116",
-  "type": "module",
-  "description": "core-plugins",
-  "keywords": [
-    "fastify",
-    "table",
-    "crud",
-    "auth",
-    "pg",
-    "backend"
-  ],
-  "main": "dist/index.js",
-  "exports": {
-    ".": "./dist/index.js",
-    "./index.js": "./dist/index.js",
-    "./utils.js": "./dist/utils.js"
-  },
-  "files": [
-    "dist/*"
-  ],
-  "scripts": {
-    "dump": "bun ./script/dump.ts",
-    "migrate": "MIGRATE=true bun ./script/migrate.ts",
-    "dump1": "bun ./dist/script/dump.js",
-    "migrate1": "MIGRATE=true bun ./dist/script/migrate.js",
-    "prepublishOnly": "npm run build",
-    "clean": "tsc -b --clean",
-    "build": "tsc -b --clean && tsc && copyfiles server/plugins/grpc/utils/*.proto dist && copyfiles server/migrations/*.sql dist && copyfiles server/templates/**/*.html dist && copyfiles server/templates/**/*.hbs dist && copyfiles script/* dist && copyfiles -u 2 module/core/*/* dist/module/core",
-    "prod": "NODE_ENV=production bun dist/server",
-    "patch": "npm version patch && git push && npm publish",
-    "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
-    "test": "npx vitest run",
-    "compress": "node compress.js",
-    "dev1": "bun --hot dist/server",
-    "dev": "NODE_ENV=production bun start",
-    "start": "LOG_LEVEL=trace bun server"
-  },
-  "dependencies": {
-    "@aws-sdk/client-s3": "3.879.0",
-    "@aws-sdk/lib-storage": "3.879.0",
-    "@fastify/cookie": "11.0.2",
-    "@fastify/http-proxy": "11.1.2",
-    "@fastify/multipart": "9.0.3",
-    "@fastify/passport": "3.0.2",
-    "@fastify/rate-limit": "10.3.0",
-    "@fastify/session": "11.1.0",
-    "@grpc/grpc-js": "1.10.11",
-    "@grpc/proto-loader": "0.7.15",
-    "apache-crypt": "1.2.6",
-    "better-sqlite3": "12.2.0",
-    "dotenv": "16.5.0",
-    "fastify": "5.3.3",
-    "fastify-plugin": "5.0.1",
-    "fastify-session-redis-store": "7.1.2",
-    "handlebars": "4.7.8",
-    "image-size": "1.2.0",
-    "ioredis": "5.3.2",
-    "js-yaml": "4.1.0",
-    "markdown-it": "14.1.0",
-    "nodemailer": "7.0.6",
-    "otplib": "12.0.1",
-    "pg": "8.11.6",
-    "pino": "9.5.0",
-    "pino-abstract-transport": "2.0.0",
-    "promised-handlebars": "2.0.1",
-    "qrcode": "1.5.4",
-    "sharp": "0.34.5",
-    "uglify-js": "3.19.3",
-    "undici": "7.16.0"
-  },
-  "devDependencies": {
-    "@types/better-sqlite3": "^7.6.13",
-    "@types/bun": "^1.3.5",
-    "@types/js-yaml": "^4.0.9",
-    "@types/markdown-it": "^14.1.2",
-    "@types/node": "^24.3.1",
-    "@types/nodemailer": "^7.0.1",
-    "@types/passport": "^1.0.17",
-    "@types/passport-local": "^1.0.38",
-    "@types/pg": "^8.15.5",
-    "@types/qrcode": "^1.5.5",
-    "copyfiles": "^2.4.1",
-    "eslint": "^9.35.0",
-    "eslint-config-airbnb-extended": "^2.3.1",
-    "ts-migrate": "^0.1.35",
-    "typescript": "^5.9.2",
-    "vitest": "^3.2.4"
-  },
-  "author": "Softpro",
-  "license": "ISC"
-}
+{
+  "name": "@opengis/fastify-table",
+  "version": "2.0.118",
+  "type": "module",
+  "description": "core-plugins",
+  "keywords": [
+    "fastify",
+    "table",
+    "crud",
+    "auth",
+    "pg",
+    "backend"
+  ],
+  "main": "dist/index.js",
+  "exports": {
+    ".": "./dist/index.js",
+    "./index.js": "./dist/index.js",
+    "./utils.js": "./dist/utils.js"
+  },
+  "files": [
+    "dist/*"
+  ],
+  "scripts": {
+    "dump": "bun ./script/dump.ts",
+    "migrate": "MIGRATE=true bun ./script/migrate.ts",
+    "dump1": "bun ./dist/script/dump.js",
+    "migrate1": "MIGRATE=true bun ./dist/script/migrate.js",
+    "prepublishOnly": "npm run build",
+    "clean": "tsc -b --clean",
+    "build": "tsc -b --clean && tsc && copyfiles server/plugins/grpc/utils/*.proto dist && copyfiles server/migrations/*.sql dist && copyfiles server/templates/**/*.html dist && copyfiles server/templates/**/*.hbs dist && copyfiles script/* dist && copyfiles -u 2 module/core/*/* dist/module/core",
+    "prod": "NODE_ENV=production bun dist/server",
+    "patch": "npm version patch && git push && npm publish",
+    "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
+    "test": "npx vitest run",
+    "compress": "node compress.js",
+    "dev1": "bun --hot dist/server",
+    "dev": "NODE_ENV=production bun start",
+    "start": "LOG_LEVEL=trace bun server"
+  },
+  "dependencies": {
+    "@aws-sdk/client-s3": "3.879.0",
+    "@aws-sdk/lib-storage": "3.879.0",
+    "@fastify/cookie": "11.0.2",
+    "@fastify/http-proxy": "11.1.2",
+    "@fastify/multipart": "9.0.3",
+    "@fastify/passport": "3.0.2",
+    "@fastify/rate-limit": "10.3.0",
+    "@fastify/session": "11.1.0",
+    "@grpc/grpc-js": "1.10.11",
+    "@grpc/proto-loader": "0.7.15",
+    "apache-crypt": "1.2.6",
+    "better-sqlite3": "12.2.0",
+    "dotenv": "16.5.0",
+    "fastify": "5.3.3",
+    "fastify-plugin": "5.0.1",
+    "fastify-session-redis-store": "7.1.2",
+    "handlebars": "4.7.8",
+    "image-size": "1.2.0",
+    "ioredis": "5.3.2",
+    "js-yaml": "4.1.0",
+    "markdown-it": "14.1.0",
+    "nodemailer": "7.0.6",
+    "otplib": "12.0.1",
+    "pg": "8.11.6",
+    "pino": "9.5.0",
+    "pino-abstract-transport": "2.0.0",
+    "promised-handlebars": "2.0.1",
+    "qrcode": "1.5.4",
+    "sharp": "0.34.5",
+    "uglify-js": "3.19.3",
+    "undici": "7.16.0"
+  },
+  "devDependencies": {
+    "@types/better-sqlite3": "^7.6.13",
+    "@types/bun": "^1.3.5",
+    "@types/js-yaml": "^4.0.9",
+    "@types/markdown-it": "^14.1.2",
+    "@types/node": "^24.3.1",
+    "@types/nodemailer": "^7.0.1",
+    "@types/passport": "^1.0.17",
+    "@types/passport-local": "^1.0.38",
+    "@types/pg": "^8.15.5",
+    "@types/qrcode": "^1.5.5",
+    "copyfiles": "^2.4.1",
+    "eslint": "^9.35.0",
+    "eslint-config-airbnb-extended": "^2.3.1",
+    "ts-migrate": "^0.1.35",
+    "typescript": "^5.9.2",
+    "vitest": "^3.2.4"
+  },
+  "author": "Softpro",
+  "license": "ISC"
+}