@opengis/fastify-table 2.0.54 → 2.0.56

package/dist/server/plugins/policy/funcs/checkPolicy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"checkPolicy.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/policy/funcs/checkPolicy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE5C,OAAO,KAAK,EAEV,eAAe,EAEhB,MAAM,wBAAwB,CAAC;AAKhC,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE,YAAY,oSA6K5E"}
+{"version":3,"file":"checkPolicy.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/policy/funcs/checkPolicy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE5C,OAAO,KAAK,EAEV,eAAe,EAEhB,MAAM,wBAAwB,CAAC;AAKhC,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE,YAAY,oSA8K5E"}

package/dist/server/plugins/policy/funcs/checkPolicy.js

@@ -22,7 +22,8 @@ export default function checkPolicy(req, reply) {
         config.admin ||
         hostname.startsWith("admin");
     const { role, referer, policy = [], } = (routeOptions?.config || {});
-    const isRole = (role && user?.user_type !== role) ||
+    // role=admin|regular
+    const isRole = (role && (!user?.user_type || !role?.includes?.(user?.user_type))) ||
         (policy.includes("admin") && user?.user_type !== "admin");
     const allowExtPublic = [".png", ".jpg", ".svg"];
     const ext = path.toLowerCase().substr(-4);

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

@@ -1 +1 @@
-{"version":3,"file":"export.d.ts","sourceRoot":"","sources":["../../../../../server/routes/file/controllers/export.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AA0B5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAKzD;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,wBAA8B,WAAW,CACvC,EACE,EAAqB,EACrB,IAAI,EACJ,QAAQ,EACR,OAAO,EAAE,QAAQ,EACjB,GAAG,EACH,KAAU,EACV,IAAkB,EAClB,QAAQ,EACR,UAAU,GACX,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3B,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,EACD,KAAK,EAAE,YAAY,gBAmVpB"}
+{"version":3,"file":"export.d.ts","sourceRoot":"","sources":["../../../../../server/routes/file/controllers/export.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AA0B5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAKzD;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,wBAA8B,WAAW,CACvC,EACE,EAAqB,EACrB,IAAI,EACJ,QAAQ,EACR,OAAO,EAAE,QAAQ,EACjB,GAAG,EACH,KAAU,EACV,IAAkB,EAClB,QAAQ,EACR,UAAU,GACX,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3B,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,EACD,KAAK,EAAE,YAAY,gBAgWpB"}

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

@@ -51,7 +51,7 @@ export default async function exportTable({ pg = pgClients.client, user, unittes
         return reply.status(400).send("param format is invalid");
     }
     const date = new Date();
-    const sufixName = `${filter}-${cols || "all"}-${search}-${query.limit || "unlimited"}`;
+    const sufixName = `${filter}-${cols || "all"}-${search}-${query.limit || "unlimited"}-${id}`;
     const sufixDate = [
         date.getFullYear(),
         date.getMonth(),
@@ -91,7 +91,8 @@ export default async function exportTable({ pg = pgClients.client, user, unittes
     }
     const loadTable = await getTemplate("table", table);
     const meta = await getMeta({ pg, table: loadTable?.table || table });
-    if (!meta?.pk && !meta?.view && !tableSql) {
+    const viewSql = await getTemplate("view", loadTable?.table || table);
+    if (!meta?.pk && !meta?.view && !tableSql && !viewSql) {
         return reply.status(404).send("table not found");
     }
     if (format === "geojson" && !meta?.geom) {
@@ -110,9 +111,11 @@ export default async function exportTable({ pg = pgClients.client, user, unittes
         sufix: false,
     };
     // check total count, debug sql etc.
-    const result = tableSql
+    const result = tableSql || viewSql
         ? await pg
-            .query(`select count(*) as total, json_agg(row_to_json(q)) as rows from (${tableSql})q`)
+            .query(`select count(*) as total, json_agg(row_to_json(q)) as rows from (${tableSql || viewSql})q where ${loadTable?.key && id
+            ? `${loadTable?.key}::text = '${id}'`
+            : "true"}`)
             .then((el) => el.rows?.[0] || {})
         : await getData(options, reply, true);
     if (sql)
@@ -174,8 +177,10 @@ export default async function exportTable({ pg = pgClients.client, user, unittes
         while (+filtered - offset > 0 && !res?.error) {
             try {
                 send(`Оброблено: ${offset}/${filtered}`);
-                const { rows = [] } = tableSql
-                    ? await pg.query(`select * from (${tableSql})q limit ${options.limit} offset ${offset}`)
+                const { rows = [] } = tableSql || viewSql
+                    ? await pg.query(`select * from (${tableSql || viewSql})q where ${loadTable?.key && id
+                        ? `${loadTable?.key}::text = '${id}'`
+                        : "true"} limit ${options.limit} offset ${offset}`)
                     : await getData({ ...options, page }, reply, true);
                 send(`seq: ${++seq}`);
                 send(`Обробка ${rows.length} об'єктів...`);

package/dist/server/routes/table/functions/getData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getData.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/functions/getData.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AA4DzD,wBAA8B,OAAO,CACnC,EACE,EAAqB,EACrB,MAAM,EACN,KAAK,EACL,EAAE,EACF,OAAY,EACZ,KAAU,EACV,IAAS,EACT,YAAY,EACZ,KAAY,EACZ,UAAU,EACV,OAAO,EAAE,YAAY,GACtB,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,MAAM,CAAC,EAAE;QAAE,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IACxD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,UAAU,CAAC,EAAE,GAAG,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB,EACD,KAAK,EAAE,YAAY,EACnB,MAAM,CAAC,EAAE,GAAG,gBAgzBb"}
+{"version":3,"file":"getData.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/functions/getData.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AA4DzD,wBAA8B,OAAO,CACnC,EACE,EAAqB,EACrB,MAAM,EACN,KAAK,EACL,EAAE,EACF,OAAY,EACZ,KAAU,EACV,IAAS,EACT,YAAY,EACZ,KAAY,EACZ,UAAU,EACV,OAAO,EAAE,YAAY,GACtB,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,MAAM,CAAC,EAAE;QAAE,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IACxD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,UAAU,CAAC,EAAE,GAAG,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB,EACD,KAAK,EAAE,YAAY,EACnB,MAAM,CAAC,EAAE,GAAG,gBAwzBb"}

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

@@ -137,13 +137,16 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
             user,
         }, null)) || {};
     const tableMeta = await getMeta({ pg, table: table1 });
+    const viewSql = await getTemplate("view", table1);
     timeArr.push(Date.now());
     if (tableMeta?.view) {
         if (!loadTable?.key && !tokenData?.key)
             return { message: `key not found: ${table1}`, status: 404 };
         Object.assign(tableMeta, { pk: loadTable?.key || tokenData?.key });
     }
-    const { pk, columns: dbColumns = [] } = tableMeta || {};
+    const { pk, columns: dbColumns = [] } = (viewSql
+        ? { pk: loadTable?.key, columns: loadTable?.columns }
+        : tableMeta) || {};
     const columns1 = columns ||
         dbColumns.map(({ name, title, dataTypeID }) => ({
             name,
@@ -176,9 +179,9 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
         ?.filter?.((el) => el.inline)
         ?.map((el) => `,(${el.sql})`)
         ?.join("") || "";
-    const { fields = [] } = pg.queryCache
-        ? await pg.queryCache(`select * ${sqlInline} from ${table1} t ${sqlTable} ${cardSqlTable} limit 0`)
-        : {};
+    const { fields = [] } = !viewSql
+        ? await pg.query(`select * ${sqlInline} from ${table1} t ${sqlTable} ${cardSqlTable} limit 0`)
+        : await pg.query(`select * from (${viewSql})q limit 0`);
     const dbColumnsTable = fields.map((el) => el.name);
     const cols = columns
         .filter((el) => el.name !== "geom" && dbColumnsTable.includes(el.name))
@@ -295,7 +298,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 ${table1} t  ${sqlTable} ) t 
+        .join("") || ""} from ${viewSql ? `(${viewSql})` : table1} t  ${sqlTable} ) t 
                       
                      ${objectId ? cardSqlTable : ""} 
                      where ${where.join(" and ") || "true"} 
@@ -373,7 +376,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 ${table1} t ${sqlTable})q 
+        .join("") || ""} from ${viewSql ? `(${viewSql})` : table1} t ${sqlTable})q 
             where ${[loadTable?.query, tokenData?.query, accessQuery, contextQuery]
         .filter(Boolean)
         .filter((el) => checkQuery(el))

package/dist/server/routes/util/controllers/code.generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"code.generator.d.ts","sourceRoot":"","sources":["../../../../../server/routes/util/controllers/code.generator.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAazD,wBAA8B,aAAa,CACzC,EACE,EAAqB,EACrB,MAAW,EACX,IAAS,EACT,KAAU,GACX,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,MAAM,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC5C,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,KAAK,EAAE;QAAE,IAAI,CAAC,EAAE,SAAS,CAAA;KAAE,CAAC;CAC7B,EACD,KAAK,EAAE,YAAY,kBA8FpB"}
+{"version":3,"file":"code.generator.d.ts","sourceRoot":"","sources":["../../../../../server/routes/util/controllers/code.generator.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AA0EzD,wBAA8B,aAAa,CACzC,EACE,EAAqB,EACrB,MAAW,EACX,IAAS,EACT,KAAU,GACX,EAAE;IACD,EAAE,EAAE,UAAU,CAAC;IACf,MAAM,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC5C,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,KAAK,EAAE;QAAE,IAAI,CAAC,EAAE,SAAS,CAAA;KAAE,CAAC;CAC7B,EACD,KAAK,EAAE,YAAY,kBA+GpB"}

package/dist/server/routes/util/controllers/code.generator.js

@@ -11,6 +11,54 @@ function dayOfTheYear(date) {
     const day = Math.floor(diff / oneDay);
     return day;
 }
+const optionsKeys = [
+    "HH",
+    "HH12",
+    "HH24",
+    "MI",
+    "SS",
+    "YYYY",
+    "YY",
+    "MONTH",
+    "MON",
+    "MM",
+    "D",
+    "DD",
+    "DDD",
+    // "NUMM",
+    // "NUMY",
+];
+const regexp = new RegExp(`\\b(${optionsKeys.join("|")}|NUM[MY]\\s?\\d?)\\b`, "gi");
+function getOptions(data = {}, pattern = "", numYear = 0, nextNum = 0) {
+    const date = new Date();
+    const options = {
+        HH: date.getHours(), // hours 24h: 14:00 = 14
+        HH12: (date.getHours() + 24) % 12 || 12, // hours 12h: 14:00 = 2
+        HH24: date.getHours(), // hours 24h: 14:00 = 14
+        MI: date.getMinutes(), // minutes
+        SS: date.getSeconds(), // seconds
+        YYYY: date.getFullYear(), // full year: 2025
+        YY: date.getFullYear().toString().substring(2, 4), // last 2 digits of year: 25
+        MONTH: date.toLocaleString("en", { month: "long" }).toUpperCase(), // month name: MARCH
+        MON: date
+            .toLocaleString("en", { month: "long" })
+            .substring(0, 3)
+            .toUpperCase(), // month name abbrev: MAR
+        MM: date.getMonth() + 1, // month number: 1 - january, 12 - december
+        D: date.getDay(), // day of the week: 1 - monday, 7 - sunday
+        DD: date.getDate(), // day of the month: january 4 = 4
+        DDD: dayOfTheYear(date), // day of the year: march 4 = 63
+        ...data,
+    };
+    const template = pattern.match(/NUM[M|Y] ?\d?/g)?.reduce((acc, curr) => {
+        const value = handlebarsSync.compile("{{paddingNumber value padding}}")({
+            padding: curr.substring(4, curr.length)?.trim?.() || 6,
+            value: curr.startsWith("NUMY") ? +numYear : +nextNum,
+        });
+        return acc.replace(curr.startsWith("{{{") ? `{{{${curr}}}}` : `{{${curr}}}`, value);
+    }, pattern) || pattern;
+    return { template, options };
+}
 export default async function codeGenerator({ pg = pgClients.client, params = {}, user = {}, query = {}, }, reply) {
     const { token, column } = params;
     const data = query.data?.split?.(";") || [];
@@ -21,6 +69,30 @@ export default async function codeGenerator({ pg = pgClients.client, params = {}
         return reply.status(401).send("unauthorized");
     }
     const tokenData = (await getToken({ token, uid: user?.uid, json: 1 })) || {};
+    const currentYear = new Date().getFullYear();
+    // unique entity per table, table as key - property_text = pattern as yyyy-mm-dd/numy
+    if (pg?.pk?.[token]) {
+        const pattern1 = pg
+            ? await pg
+                .query(`select property_text from admin.properties where property_entity=$1 and property_key=$2`, [`code:${column.replace(/'/g, "''")}`, token])
+                .then((el) => el.rows?.[0]?.property_text)
+            : null;
+        // force pattern keys to upperCase for handlebars compile
+        const pattern = (pattern1 || column).replace(regexp, (_, m) => `{{${m.toUpperCase()}}}`);
+        const count = pg
+            ? await pg
+                .query(`select count(*) + 1 as count from ${token}`)
+                .then((el) => el.rows?.[0]?.count || 0)
+            : 0;
+        const numYear = pg
+            ? await pg
+                .query(`select count(*) + 1 as count from ${token} where date_part('year', created_at)=$1`, [currentYear])
+                .then((el) => el.rows?.[0]?.count || 0)
+            : 0;
+        const { template, options } = getOptions(data, pattern, numYear, count);
+        const result = handlebarsSync.compile(template)(options);
+        return reply.status(200).send(result);
+    }
     if (!tokenData?.form || !tokenData?.table) {
         return reply.status(401).send("token not allow");
     }
@@ -41,35 +113,17 @@ export default async function codeGenerator({ pg = pgClients.client, params = {}
     if (!pg.pk?.[table]) {
         return reply.status(404).send("table pk not found");
     }
-    const { count = 0 } = await pg
-        .query(`select count(*) from ${table} where ${columnValue ? `${column}::text = '${columnValue}'` : "true"} limit 1`)
-        .then((el) => el.rows?.[0] || {});
-    const { NUMY = 0 } = await pg
-        .query(`select ${column} as "NUMY" from ${table} where ${column} is not null and date_part('year', cdate) = $1 order by cdate desc limit 1`, [new Date().getFullYear()])
-        .then((el) => el.rows?.[0] || {});
-    const date = new Date();
-    const template = schema[column].template.match(/NUM[M|Y] \d/g).reduce((acc, curr) => acc.replace(curr.startsWith("{{{") ? `{{{${curr}}}}` : `{{${curr}}}`, handlebarsSync.compile("{{paddingNumber value padding}}")({
-        padding: curr.substring(4, curr.length)?.trim?.(),
-        value: curr.startsWith("NUMY") ? NUMY : +count + 1,
-    })), schema[column].template);
-    const result = handlebarsSync.compile(template)({
-        HH: date.getHours(), // hours 24h: 14:00 = 14
-        HH12: (date.getHours() + 24) % 12 || 12, // hours 12h: 14:00 = 2
-        HH24: date.getHours(), // hours 24h: 14:00 = 14
-        MI: date.getMinutes(), // minutes
-        SS: date.getSeconds(), // seconds
-        YYYY: date.getFullYear(), // full year: 2025
-        YY: date.getFullYear().toString().substring(2, 4), // last 2 digits of year: 25
-        MONTH: date.toLocaleString("en", { month: "long" }).toUpperCase(), // month name: MARCH
-        MON: date
-            .toLocaleString("en", { month: "long" })
-            .substring(0, 3)
-            .toUpperCase(), // month name abbrev: MAR
-        MM: date.getMonth() + 1, // month number: 1 - january, 12 - december
-        D: date.getDay(), // day of the week: 1 - monday, 7 - sunday
-        DD: date.getDate(), // day of the month: january 4 = 4
-        DDD: dayOfTheYear(date), // day of the year: march 4 = 63
-        ...data,
-    });
+    const count = pg
+        ? await pg
+            .query(`select count(*) + 1 as count from ${table} where ${columnValue ? `${column}::text = '${columnValue}'` : "true"} limit 1`)
+            .then((el) => el.rows?.[0]?.count || 0)
+        : 0;
+    const numYear = pg
+        ? await pg
+            .query(`select ${column} + 1 as count from ${table} where ${column} is not null and date_part('year', cdate) = $1 order by cdate desc limit 1`, [currentYear])
+            .then((el) => el.rows?.[0]?.count || 0)
+        : 0;
+    const { template, options } = getOptions(data, schema[column].template, numYear, count);
+    const result = handlebarsSync.compile(template)(options);
     return reply.status(200).send(result);
 }

package/package.json

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