@opengis/fastify-table 2.5.34 → 2.5.36

package/dist/server/plugins/file/utils/inspectContent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"inspectContent.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/file/utils/inspectContent.ts"],"names":[],"mappings":"AAwCA,wBAA8B,cAAc,CAC1C,MAAM,EAAE,MAAM,EACd,iBAAiB,EAAE,MAAM;;;;GA+B1B"}
+{"version":3,"file":"inspectContent.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/file/utils/inspectContent.ts"],"names":[],"mappings":"AA+CA,wBAA8B,cAAc,CAC1C,MAAM,EAAE,MAAM,EACd,iBAAiB,EAAE,MAAM;;;;GAwC1B"}

package/dist/server/plugins/file/utils/inspectContent.js

@@ -1,6 +1,12 @@
 import { fileTypeFromBuffer } from "file-type";
 import { BadRequestError } from "../../../../errors.js";
 import applyHook from "../../hook/applyHook.js";
+// Office 97–2003 (.doc/.xls/.ppt) share CFB magic; file-type reports them as "cfb"
+const cfbOfficeMimes = {
+    doc: "application/msword",
+    xls: "application/vnd.ms-excel",
+    ppt: "application/vnd.ms-powerpoint",
+};
 const handlers = {
     pdf: (buffer) => {
         const head = buffer.subarray(0, 1024).toString("latin1");
@@ -53,6 +59,14 @@ export default async function inspectContent(buffer, expectedExtension) {
         const { ext: ext2, mime: mime2 } = (await handlers[expectedExtension](buffer)) || {};
         return { ext: ext2, mime: mime2, isValid: ext2 === expectedExtension };
     }
+    // ? .doc/.xls/.ppt are CFB containers — file-type returns "cfb", not the office ext
+    if (ext === "cfb" && cfbOfficeMimes[expectedExtension]) {
+        return {
+            ext: expectedExtension,
+            mime: cfbOfficeMimes[expectedExtension],
+            isValid: true,
+        };
+    }
     // ? simple xml, pdf are recognized via file-type
     return { ext, mime, isValid: ext === expectedExtension };
 }

package/dist/server/plugins/logger/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/plugins/logger/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAgC,MAAM,SAAS,CAAC;AAqE7E,iBAAS,YAAY,CAAC,OAAO,EAAE,eAAe,QA+C7C;AACD,eAAe,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/plugins/logger/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAgC,MAAM,SAAS,CAAC;AAqE7E,iBAAS,YAAY,CAAC,OAAO,EAAE,eAAe,QAmD7C;AACD,eAAe,YAAY,CAAC"}

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

@@ -71,7 +71,9 @@ function loggerPlugin(fastify) {
         if (error.statusCode && logWarningCodes.includes(error.statusCode)) {
             logger.warn(error, request);
         }
-        if (process.env.trace === "true") {
+        if (process.env.trace === "true" ||
+            process.env.NODE_ENV === "test" ||
+            process.env.VITEST) {
             console.error({
                 msg: error.message,
                 where: error.where,

package/dist/server/plugins/pg/funcs/getMeta.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getMeta.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/pg/funcs/getMeta.ts"],"names":[],"mappings":"AAMA,wBAA8B,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,GAAG,gBAmG5D"}
+{"version":3,"file":"getMeta.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/pg/funcs/getMeta.ts"],"names":[],"mappings":"AAMA,wBAA8B,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,GAAG,gBA0G5D"}

package/dist/server/plugins/pg/funcs/getMeta.js

@@ -11,8 +11,11 @@ export default async function getMeta(opt, nocache) {
     if (!pg.pk || nocache) {
         await init(pg);
     }
-    const tableOriginal = opt?.table || opt;
-    const [schemaName, tableName] = tableOriginal?.replace?.(/"/g, "").split(".");
+    const tableOriginal = opt?.table || (typeof opt === "string" ? opt : undefined);
+    if (!tableOriginal) {
+        throw BadRequestError("not enough params: table");
+    }
+    const [schemaName, tableName] = tableOriginal?.replace?.(/"/g, "")?.split?.(".") || [];
     const tableSafe = `${schemaName}."${tableName}"`;
     const tableUnsafe = `${schemaName}.${tableName}`;
     if (pg?.options?.database &&

package/dist/server/routes/table/controllers/suggest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"suggest.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/suggest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AA8BpD,wBAAsB,kBAAkB,CAAC,EACvC,KAAK,EACL,QAAQ,EACR,MAAM,EACN,UAAU,EACV,QAAQ,EACR,UAAU,EACV,GAAG,EACH,EAAqB,GACtB,EAAE;IACD,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,GAAG,CAAC;IACZ,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,EAAE,CAAC,EAAE,UAAU,CAAC;CACjB;;;;;UAwFA;AAED,wBAA8B,OAAO,CAAC,GAAG,EAAE,GAAG,gBAuc7C"}
+{"version":3,"file":"suggest.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/suggest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AA8BpD,wBAAsB,kBAAkB,CAAC,EACvC,KAAK,EACL,QAAQ,EACR,MAAM,EACN,UAAU,EACV,QAAQ,EACR,UAAU,EACV,GAAG,EACH,EAAqB,GACtB,EAAE;IACD,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,GAAG,CAAC;IACZ,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,EAAE,CAAC,EAAE,UAAU,CAAC;CACjB;;;;;UAwFA;AAED,wBAA8B,OAAO,CAAC,GAAG,EAAE,GAAG,gBAod7C"}

package/dist/server/routes/table/controllers/suggest.js

@@ -139,6 +139,9 @@ export default async function suggest(req) {
         };
     }
     const body = await getTemplate("table", table);
+    if (table && !hookBody?.table && !body?.table) {
+        throw ForbiddenError("invalid params: table");
+    }
     const tableName = hookBody?.table || body?.table || table;
     if (query.limit && query.limit < 0) {
         throw BadRequestError("param limit is invalid");
@@ -171,6 +174,12 @@ export default async function suggest(req) {
     }
     const limit = meta?.limit || defaultLimit;
     const pg = meta?.db ? await getPGAsync(meta.db) : pg1;
+    const filters = table
+        ? await getFilter({ pg, table }).then((r) => r.list || [])
+        : [];
+    if (table && column && !filters.find((el) => el.name === column)) {
+        throw ForbiddenError("invalid params: column");
+    }
     if (!pg || !pg.pk || !pg.pgType) {
         throw Error("empty pg");
     }

package/package.json

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