@zauru-sdk/graphql 6.7.0 → 6.9.0

package/dist/GraphQL.queries.d.ts

@@ -5,7 +5,7 @@ export declare const getPurchaseOrderStringQuery: (id: number, config?: {
     withPayee: boolean;
     withReceptions: boolean;
 }) => string;
-export declare const getShipmentsStringQuery: ({ agency_to_id, agency_from_id, suffix, voided, delivered, shipped, returned, id_number_not_null, id_number, id_number_not_empty, withMovementLots, withPurchaseOrdersByShipmentReference, limit, id, wheres, memoILike, plannedShippingDateRange, plannedDeliveryDateRange, }: {
+export declare const getShipmentsStringQuery: ({ agency_to_id, agency_from_id, suffix, voided, delivered, shipped, returned, id_number_not_null, id_number, id_number_not_empty, withMovementLots, withMovements, withPurchaseOrdersByShipmentReference, limit, id, wheres, memoILike, plannedShippingDateRange, plannedDeliveryDateRange, }: {
     agency_to_id?: number | number[];
     agency_from_id?: number | number[];
     suffix?: string;
@@ -17,6 +17,7 @@ export declare const getShipmentsStringQuery: ({ agency_to_id, agency_from_id, s
     id_number?: string;
     id_number_not_empty?: boolean;
     withMovementLots?: boolean;
+    withMovements?: boolean;
     withPurchaseOrdersByShipmentReference?: boolean;
     limit?: number;
     id?: number | string;
@@ -87,8 +88,18 @@ export type GetWebAppRowsByTableIdOptions = {
     /**
      * JSONB `_contains` filters against `webapp_rows.data`.
      * Multiple keys are AND-ed. An array value becomes an OR of `_contains`.
+     * Numeric scalars also match the string form (`1` or `"1"`), because JSONB is typed.
      */
     data?: Record<string, WebAppRowDataFilterValue>;
+    /**
+     * Filter the row timestamp (`webapp_rows.created_at`), not `data`.
+     * Values are GraphQL string literals (`YYYY-MM-DD` or ISO-8601).
+     */
+    createdAt?: {
+        gte?: string;
+        lte?: string;
+        lt?: string;
+    };
 };
 export declare const getWebAppRowsByWebAppTableIdStringQuery: (webapp_table_id: number, options?: GetWebAppRowsByTableIdOptions) => string;
 export declare const getPayeeCategoryByIdStringQuery: (id: number) => string;

package/dist/esm/GraphQL.queries.js

@@ -203,7 +203,7 @@ query getPurchaseOrder($id: bigint) @cached {
 `;
 };
 exports.getPurchaseOrderStringQuery = getPurchaseOrderStringQuery;
-const getShipmentsStringQuery = ({ agency_to_id, agency_from_id, suffix, voided, delivered, shipped, returned, id_number_not_null = false, id_number, id_number_not_empty = false, withMovementLots = false, withPurchaseOrdersByShipmentReference = false, limit = 1000, id, wheres, memoILike, plannedShippingDateRange, plannedDeliveryDateRange, }) => {
+const getShipmentsStringQuery = ({ agency_to_id, agency_from_id, suffix, voided, delivered, shipped, returned, id_number_not_null = false, id_number, id_number_not_empty = false, withMovementLots = false, withMovements = true, withPurchaseOrdersByShipmentReference = false, limit = 1000, id, wheres, memoILike, plannedShippingDateRange, plannedDeliveryDateRange, }) => {
     let conditions = [];
     if (agency_to_id) {
         if (Array.isArray(agency_to_id)) {
@@ -286,6 +286,17 @@ const getShipmentsStringQuery = ({ agency_to_id, agency_from_id, suffix, voided,
           }
         }`
         : "";
+    const movements = withMovements
+        ? `movements {
+        id
+        booked_quantity
+        delivered_quantity
+        reference
+        item_id
+        lot_id
+        ${movementLots}
+      }`
+        : "";
     return `query getShipments {
     shipments(
       limit: ${limit}, 
@@ -319,15 +330,7 @@ const getShipmentsStringQuery = ({ agency_to_id, agency_from_id, suffix, voided,
       returned_at
       returner_id
       ${purchaseOrdersByShipmentReference}
-      movements {
-        id
-        booked_quantity
-        delivered_quantity
-        reference
-        item_id
-        lot_id
-        ${movementLots}
-      }
+      ${movements}
     }
   }`;
 };
@@ -677,6 +680,7 @@ query getWebAppRow {
 `;
 exports.getWebAppRowStringQuery = getWebAppRowStringQuery;
 const GRAPHQL_NAME_RE = /^[A-Za-z_][A-Za-z0-9_]*$/;
+const GRAPHQL_TIMESTAMP_RE = /^\d{4}-\d{2}-\d{2}(T\d{2}:\d{2}(:\d{2}(\.\d+)?)?(Z|[+-]\d{2}:\d{2})?)?$/;
 const serializeGraphQLLiteral = (value) => {
     if (value === null) {
         return "null";
@@ -698,6 +702,28 @@ const buildDataContainsClause = (key, value) => {
     }
     return `{ data: { _contains: { ${key}: ${serializeGraphQLLiteral(value)} } } }`;
 };
+const expandJsonbContainsValue = (value) => {
+    if (typeof value === "number" && Number.isFinite(value)) {
+        return [value, String(value)];
+    }
+    if (typeof value === "string" && value !== "" && Number.isFinite(Number(value))) {
+        return [Number(value), value];
+    }
+    return [value];
+};
+const uniqueJsonbContainsValues = (values) => {
+    const seen = new Set();
+    const unique = [];
+    for (const value of values) {
+        const identity = `${typeof value}:${String(value)}`;
+        if (seen.has(identity)) {
+            continue;
+        }
+        seen.add(identity);
+        unique.push(value);
+    }
+    return unique;
+};
 const buildDataFilterAndClauses = (data) => {
     if (!data) {
         return [];
@@ -707,7 +733,7 @@ const buildDataFilterAndClauses = (data) => {
         if (raw === undefined) {
             continue;
         }
-        const values = Array.isArray(raw) ? raw : [raw];
+        const values = uniqueJsonbContainsValues((Array.isArray(raw) ? raw : [raw]).flatMap(expandJsonbContainsValue));
         if (values.length === 0) {
             continue;
         }
@@ -721,13 +747,39 @@ const buildDataFilterAndClauses = (data) => {
     }
     return andParts;
 };
+const serializeGraphQLTimestamp = (value, bound) => {
+    if (!GRAPHQL_TIMESTAMP_RE.test(value)) {
+        throw new Error(`Invalid webapp row created_at ${bound}: ${value}`);
+    }
+    return JSON.stringify(value);
+};
+const buildCreatedAtClause = (createdAt) => {
+    if (!createdAt) {
+        return "";
+    }
+    const bounds = [];
+    if (createdAt.gte) {
+        bounds.push(`_gte: ${serializeGraphQLTimestamp(createdAt.gte, "gte")}`);
+    }
+    if (createdAt.lte) {
+        bounds.push(`_lte: ${serializeGraphQLTimestamp(createdAt.lte, "lte")}`);
+    }
+    if (createdAt.lt) {
+        bounds.push(`_lt: ${serializeGraphQLTimestamp(createdAt.lt, "lt")}`);
+    }
+    return bounds.length ? `created_at: { ${bounds.join(", ")} }` : "";
+};
 const getWebAppRowsByWebAppTableIdStringQuery = (webapp_table_id, options) => {
-    const { limit, data } = options ?? {};
+    const { limit, data, createdAt } = options ?? {};
     const tableId = Number(webapp_table_id);
     const conditions = [];
     if (tableId) {
         conditions.push(`webapp_table_id: {_eq: ${tableId}}`);
     }
+    const createdAtClause = buildCreatedAtClause(createdAt);
+    if (createdAtClause) {
+        conditions.push(createdAtClause);
+    }
     const dataAnd = buildDataFilterAndClauses(data);
     if (dataAnd.length > 0) {
         conditions.push(`_and: [${dataAnd.join(", ")}]`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zauru-sdk/graphql",
-  "version": "6.7.0",
+  "version": "6.9.0",
   "description": "Queries de uso común para las aplicación de Zauru.",
   "main": "./dist/esm/index.js",
   "module": "./dist/esm/index.js",
@@ -12,7 +12,7 @@
   "scripts": {
     "build": "npm run build:esm",
     "build:esm": "tsc -p tsconfig.esm.json",
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "tsx --test src/GraphQL.queries.test.ts"
   },
   "files": [
     "dist"
@@ -20,7 +20,8 @@
   "author": "Oscar Cuéllar",
   "license": "MIT",
   "devDependencies": {
+    "tsx": "^4.23.15",
     "typescript": "^5.1.6"
   },
-  "gitHead": "add1b36bf68bad8debe05c25fd826d68acce2810"
+  "gitHead": "2daa677e6cd4948b23bfbf862929b4c74655e4e0"
 }