xcraft-core-pickaxe 0.1.7 → 0.1.10

package/eslint.config.js

@@ -0,0 +1,62 @@
+const js = require('@eslint/js');
+const globals = require('globals');
+const react = require('eslint-plugin-react');
+const jsdoc = require('eslint-plugin-jsdoc');
+const babel = require('@babel/eslint-plugin');
+const prettier = require('eslint-config-prettier');
+const babelParser = require('@babel/eslint-parser');
+
+module.exports = [
+  js.configs.recommended,
+  react.configs.flat.recommended,
+  jsdoc.configs['flat/recommended'],
+  prettier,
+  {
+    languageOptions: {
+      parser: babelParser,
+      parserOptions: {
+        requireConfigFile: false,
+        ecmaFeatures: {
+          jsx: true,
+        },
+      },
+      globals: {
+        ...globals.browser,
+        ...globals.node,
+        ...globals.es2022,
+        ...globals.mocha,
+      },
+    },
+    plugins: {
+      'react': react,
+      'jsdoc': jsdoc,
+      '@babel': babel,
+    },
+    rules: {
+      'eqeqeq': 'error',
+      'no-console': 'off',
+      'react/display-name': 'off',
+      '@babel/no-unused-expressions': 'error',
+      'no-unused-vars': [
+        'error',
+        {
+          vars: 'all',
+          args: 'none',
+          ignoreRestSiblings: true,
+          destructuredArrayIgnorePattern: '^_',
+        },
+      ],
+      'jsdoc/require-jsdoc': 'off',
+      'jsdoc/require-param-description': 'off',
+      'jsdoc/require-returns-description': 'off',
+    },
+    settings: {
+      react: {
+        version: 'detect',
+      },
+      jsdoc: {
+        mode: 'typescript',
+      },
+    },
+  },
+];

package/lib/operators.js

@@ -19,6 +19,10 @@ function op(value) {
   if (type === 'object' && 'operator' in value) {
     return value;
   }
+  const {ValuePick} = require('./picks.js');
+  if (value instanceof ValuePick) {
+    return value.value;
+  }
 
   throw new Error(`Bad value '${value}'`);
 }

package/lib/query-builder.js

@@ -6,6 +6,7 @@ const {
   toObjectType,
   ObjectMapType,
   RecordType,
+  object,
 } = require('xcraft-core-stones');
 const operators = require('./operators.js');
 const {rowPick, ValuePick, RowPick, ObjectPick} = require('./picks.js');
@@ -58,6 +59,8 @@ const {queryToSql} = require('./query-to-sql.js');
  *   where?: Operator,
  *   orderBy?: OrderByResult,
  *   groupBy?: GroupByResult
+ *   limit?: number
+ *   offset?: number
  * }} QueryObj
  */
 
@@ -113,6 +116,7 @@ class FinalQuery {
     if (
       type instanceof ArrayType ||
       type instanceof ObjectType ||
+      type === object ||
       type instanceof ObjectMapType ||
       type instanceof RecordType
     ) {
@@ -294,6 +298,30 @@ class ScopedSelectQuery extends FinalQuery {
     };
     return new ScopedSelectQuery(this.#database, this.#type, queryParts);
   }
+
+  /**
+   * @param {number} count
+   * @returns {ScopedSelectQuery<T,R>}
+   */
+  limit(count) {
+    const queryParts = {
+      ...this.#queryParts,
+      limit: count,
+    };
+    return new ScopedSelectQuery(this.#database, this.#type, queryParts);
+  }
+
+  /**
+   * @param {number} count
+   * @returns {ScopedSelectQuery<T,R>}
+   */
+  offset(count) {
+    const queryParts = {
+      ...this.#queryParts,
+      offset: count,
+    };
+    return new ScopedSelectQuery(this.#database, this.#type, queryParts);
+  }
 }
 
 /**
@@ -367,6 +395,30 @@ class SelectQuery extends FinalQuery {
     };
     return new SelectQuery(this.#database, this.#type, queryParts);
   }
+
+  /**
+   * @param {number} count
+   * @returns {SelectQuery<T,R>}
+   */
+  limit(count) {
+    const queryParts = {
+      ...this.#queryParts,
+      limit: count,
+    };
+    return new SelectQuery(this.#database, this.#type, queryParts);
+  }
+
+  /**
+   * @param {number} count
+   * @returns {SelectQuery<T,R>}
+   */
+  offset(count) {
+    const queryParts = {
+      ...this.#queryParts,
+      offset: count,
+    };
+    return new SelectQuery(this.#database, this.#type, queryParts);
+  }
 }
 
 /**

package/lib/query-to-sql.js

@@ -64,6 +64,18 @@ function queryToSql(query, values = []) {
   if (query.groupBy) {
     result += '\n' + `GROUP BY ${groupByFields(query.groupBy, values)}`;
   }
+  if (query.limit) {
+    if (!Number.isInteger(query.limit)) {
+      throw new Error(`Bad limit '${query.limit}'`);
+    }
+    result += '\n' + `LIMIT ${query.limit}`;
+  }
+  if (query.offset) {
+    if (!Number.isInteger(query.offset)) {
+      throw new Error(`Bad offset '${query.offset}'`);
+    }
+    result += '\n' + `OFFSET ${query.offset}`;
+  }
   return {sql: result, values};
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xcraft-core-pickaxe",
-  "version": "0.1.7",
+  "version": "0.1.10",
   "description": "Query builder",
   "main": "index.js",
   "scripts": {
@@ -22,7 +22,7 @@
   "devDependencies": {
     "prettier": "2.0.4",
     "xcraft-dev-prettier": "^2.0.0",
-    "xcraft-dev-rules": "^4.1.0"
+    "xcraft-dev-rules": "^4.4.0"
   },
   "prettier": "xcraft-dev-prettier"
 }

package/.eslintrc.js

@@ -1,39 +0,0 @@
-'use strict';
-
-module.exports = {
-  root: true,
-  parserOptions: {
-    sourceType: 'module',
-    ecmaFeatures: {
-      jsx: true,
-    },
-  },
-  env: {
-    browser: true,
-    es2022: true,
-    mocha: true,
-    node: true,
-  },
-  plugins: ['react', 'babel', 'jsdoc'],
-  extends: [
-    'prettier',
-    'eslint:recommended',
-    'plugin:react/recommended',
-    'plugin:jsdoc/recommended',
-  ],
-  rules: {
-    // Other rules
-    'no-console': 'off',
-    'eqeqeq': 'error',
-    'react/display-name': 'off',
-    'no-unused-vars': [
-      'error',
-      {
-        vars: 'all',
-        args: 'none',
-        ignoreRestSiblings: true,
-        destructuredArrayIgnorePattern: '^_',
-      },
-    ],
-  },
-};