query-layers-expression 1.0.6 → 1.0.7

package/build/index.d.ts

@@ -3,6 +3,7 @@ interface queryExpressionType {
     qFields?: [any?, any?, any?];
     chartCategory?: any;
     chartCategoryField?: any;
+    chartCategoryType?: "number" | "string";
     status?: number | null;
     statusField?: any;
     qExpression?: any;
@@ -12,10 +13,11 @@ declare class QueryExpressionLayers implements queryExpressionType {
     qFields?: [any?, any?, any?] | any;
     chartCategory?: any;
     chartCategoryField?: any;
+    chartCategoryType?: "number" | "string";
     status?: number | null;
     statusField?: any;
     qExpression?: any;
-    constructor(qValues: any, qFields: any, chartCategory: any, chartCategoryField: any, status: number, statusField: any, qExpression: any);
-    queryExpression: ({ qValues, qFields, chartCategory, chartCategoryField, status, statusField, qExpression, }: queryExpressionType) => string;
+    constructor(qValues: any, qFields: any, chartCategory: any, chartCategoryField: any, chartCategoryType: "number" | "string", status: number, statusField: any, qExpression: any);
+    queryExpression: ({ qValues, qFields, chartCategory, chartCategoryField, chartCategoryType, status, statusField, qExpression, }: queryExpressionType) => string;
 }
 export default QueryExpressionLayers;

package/build/index.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 class QueryExpressionLayers {
-    constructor(qValues, qFields, chartCategory, chartCategoryField, status, statusField, qExpression) {
+    constructor(qValues, qFields, chartCategory, chartCategoryField, chartCategoryType, status, statusField, qExpression) {
         //--- Method ---//
         //--- Query Expression
-        this.queryExpression = ({ qValues, qFields, chartCategory, chartCategoryField, status, statusField, qExpression, }) => {
+        this.queryExpression = ({ qValues, qFields, chartCategory, chartCategoryField, chartCategoryType, status, statusField, qExpression, }) => {
             //--- Basic query expression
             const query1 = typeof qValues?.[0] === "number"
                 ? `${qFields?.[0]} = ${qValues?.[0]}`
@@ -18,7 +18,9 @@ class QueryExpressionLayers {
             const query12 = `${query1} AND ${query2}`;
             const query123 = `${query1} AND ${query2} AND ${query3}`;
             const q_status = `${statusField} = ${status}`;
-            const q_chartC = `${chartCategoryField} = '${chartCategory}'`;
+            const q_chartC = chartCategoryType === "string"
+                ? `${chartCategoryField} = '${chartCategory}'`
+                : `${chartCategoryField} = ${chartCategory}`;
             const q_status_chartC = `${q_status} AND ${q_chartC}`;
             const query1_chartC = `${query1} AND ${q_chartC}`;
             const query12_chartC = `${query12} AND ${q_chartC}`;
@@ -176,6 +178,7 @@ class QueryExpressionLayers {
         this.qFields = qFields;
         this.chartCategory = chartCategory;
         this.chartCategoryField = chartCategoryField;
+        this.chartCategoryType = chartCategoryType;
         this.status = status;
         this.statusField = statusField;
         this.qExpression = qExpression;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "query-layers-expression",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "",
   "license": "ISC",
   "author": "Eiji Matsuzaki",

package/src/index.ts

@@ -1,10 +1,9 @@
-import FeatureLayer from "@arcgis/core/layers/FeatureLayer";
-
 interface queryExpressionType {
   qValues?: [any?, any?, any?];
   qFields?: [any?, any?, any?];
   chartCategory?: any;
   chartCategoryField?: any;
+  chartCategoryType?: "number" | "string";
   status?: number | null;
   statusField?: any;
   qExpression?: any;
@@ -15,6 +14,7 @@ class QueryExpressionLayers implements queryExpressionType {
   qFields?: [any?, any?, any?] | any;
   chartCategory?: any;
   chartCategoryField?: any;
+  chartCategoryType?: "number" | "string";
   status?: number | null;
   statusField?: any;
   qExpression?: any;
@@ -24,6 +24,7 @@ class QueryExpressionLayers implements queryExpressionType {
     qFields: any,
     chartCategory: any,
     chartCategoryField: any,
+    chartCategoryType: "number" | "string",
     status: number,
     statusField: any,
     qExpression: any,
@@ -32,6 +33,7 @@ class QueryExpressionLayers implements queryExpressionType {
     this.qFields = qFields;
     this.chartCategory = chartCategory;
     this.chartCategoryField = chartCategoryField;
+    this.chartCategoryType = chartCategoryType;
     this.status = status;
     this.statusField = statusField;
     this.qExpression = qExpression;
@@ -44,6 +46,7 @@ class QueryExpressionLayers implements queryExpressionType {
     qFields,
     chartCategory,
     chartCategoryField,
+    chartCategoryType,
     status,
     statusField,
     qExpression,
@@ -64,7 +67,10 @@ class QueryExpressionLayers implements queryExpressionType {
     const query12 = `${query1} AND ${query2}`;
     const query123 = `${query1} AND ${query2} AND ${query3}`;
     const q_status = `${statusField} = ${status}`;
-    const q_chartC = `${chartCategoryField} = '${chartCategory}'`;
+    const q_chartC =
+      chartCategoryType === "string"
+        ? `${chartCategoryField} = '${chartCategory}'`
+        : `${chartCategoryField} = ${chartCategory}`;
     const q_status_chartC = `${q_status} AND ${q_chartC}`;
     const query1_chartC = `${query1} AND ${q_chartC}`;
     const query12_chartC = `${query12} AND ${q_chartC}`;