@nocobase/database 0.7.0-alpha.33 → 0.7.0-alpha.34

package/esm/operators/index.js

@@ -1,2 +1,2 @@
-export default Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, require('./association').default), require('./date').default), require('./array').default), require('./empty').default), require('./string').default), require('./ne').default);
+export default Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, require('./association').default), require('./date').default), require('./array').default), require('./empty').default), require('./string').default), require('./ne').default), require('./notIn').default);
 //# sourceMappingURL=index.js.map

package/esm/operators/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/operators/index.ts"],"names":[],"mappings":"AAAA,uGACK,OAAO,CAAC,eAAe,CAAC,CAAC,OAAO,GAChC,OAAO,CAAC,QAAQ,CAAC,CAAC,OAAO,GACzB,OAAO,CAAC,SAAS,CAAC,CAAC,OAAO,GAC1B,OAAO,CAAC,SAAS,CAAC,CAAC,OAAO,GAC1B,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,GAC3B,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,EAC1B","sourcesContent":["export default {\n  ...require('./association').default,\n  ...require('./date').default,\n  ...require('./array').default,\n  ...require('./empty').default,\n  ...require('./string').default,\n  ...require('./ne').default,\n};\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/operators/index.ts"],"names":[],"mappings":"AAAA,qHACK,OAAO,CAAC,eAAe,CAAC,CAAC,OAAO,GAChC,OAAO,CAAC,QAAQ,CAAC,CAAC,OAAO,GACzB,OAAO,CAAC,SAAS,CAAC,CAAC,OAAO,GAC1B,OAAO,CAAC,SAAS,CAAC,CAAC,OAAO,GAC1B,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,GAC3B,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,GACvB,OAAO,CAAC,SAAS,CAAC,CAAC,OAAO,EAC7B","sourcesContent":["export default {\n  ...require('./association').default,\n  ...require('./date').default,\n  ...require('./array').default,\n  ...require('./empty').default,\n  ...require('./string').default,\n  ...require('./ne').default,\n  ...require('./notIn').default,\n};\n"]}

package/esm/operators/notIn.d.ts

@@ -0,0 +1,10 @@
+import { Op } from 'sequelize';
+declare const _default: {
+    $notIn(val: any, ctx: any): {
+        [Op.or]: {
+            [Op.notIn]: any;
+            [Op.is]: any;
+        };
+    };
+};
+export default _default;

package/esm/operators/notIn.js

@@ -0,0 +1,12 @@
+import { Op } from 'sequelize';
+export default {
+    $notIn(val, ctx) {
+        return {
+            [Op.or]: {
+                [Op.notIn]: val,
+                [Op.is]: null,
+            },
+        };
+    },
+};
+//# sourceMappingURL=notIn.js.map

package/esm/operators/notIn.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"notIn.js","sourceRoot":"","sources":["../../src/operators/notIn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,WAAW,CAAC;AAE/B,eAAe;IACb,MAAM,CAAC,GAAG,EAAE,GAAG;QACb,OAAO;YACL,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE;gBACP,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,GAAG;gBACf,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI;aACd;SACF,CAAC;IACJ,CAAC;CACF,CAAC","sourcesContent":["import { Op } from 'sequelize';\n\nexport default {\n  $notIn(val, ctx) {\n    return {\n      [Op.or]: {\n        [Op.notIn]: val,\n        [Op.is]: null,\n      },\n    };\n  },\n};\n"]}

package/lib/operators/index.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, require('./association').default), require('./date').default), require('./array').default), require('./empty').default), require('./string').default), require('./ne').default);
+exports.default = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, require('./association').default), require('./date').default), require('./array').default), require('./empty').default), require('./string').default), require('./ne').default), require('./notIn').default);
 //# sourceMappingURL=index.js.map

package/lib/operators/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/operators/index.ts"],"names":[],"mappings":";;AAAA,0GACK,OAAO,CAAC,eAAe,CAAC,CAAC,OAAO,GAChC,OAAO,CAAC,QAAQ,CAAC,CAAC,OAAO,GACzB,OAAO,CAAC,SAAS,CAAC,CAAC,OAAO,GAC1B,OAAO,CAAC,SAAS,CAAC,CAAC,OAAO,GAC1B,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,GAC3B,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,EAC1B","sourcesContent":["export default {\n  ...require('./association').default,\n  ...require('./date').default,\n  ...require('./array').default,\n  ...require('./empty').default,\n  ...require('./string').default,\n  ...require('./ne').default,\n};\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/operators/index.ts"],"names":[],"mappings":";;AAAA,wHACK,OAAO,CAAC,eAAe,CAAC,CAAC,OAAO,GAChC,OAAO,CAAC,QAAQ,CAAC,CAAC,OAAO,GACzB,OAAO,CAAC,SAAS,CAAC,CAAC,OAAO,GAC1B,OAAO,CAAC,SAAS,CAAC,CAAC,OAAO,GAC1B,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,GAC3B,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,GACvB,OAAO,CAAC,SAAS,CAAC,CAAC,OAAO,EAC7B","sourcesContent":["export default {\n  ...require('./association').default,\n  ...require('./date').default,\n  ...require('./array').default,\n  ...require('./empty').default,\n  ...require('./string').default,\n  ...require('./ne').default,\n  ...require('./notIn').default,\n};\n"]}

package/lib/operators/notIn.d.ts

@@ -0,0 +1,10 @@
+import { Op } from 'sequelize';
+declare const _default: {
+    $notIn(val: any, ctx: any): {
+        [Op.or]: {
+            [Op.notIn]: any;
+            [Op.is]: any;
+        };
+    };
+};
+export default _default;

package/lib/operators/notIn.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const sequelize_1 = require("sequelize");
+exports.default = {
+    $notIn(val, ctx) {
+        return {
+            [sequelize_1.Op.or]: {
+                [sequelize_1.Op.notIn]: val,
+                [sequelize_1.Op.is]: null,
+            },
+        };
+    },
+};
+//# sourceMappingURL=notIn.js.map

package/lib/operators/notIn.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"notIn.js","sourceRoot":"","sources":["../../src/operators/notIn.ts"],"names":[],"mappings":";;AAAA,yCAA+B;AAE/B,kBAAe;IACb,MAAM,CAAC,GAAG,EAAE,GAAG;QACb,OAAO;YACL,CAAC,cAAE,CAAC,EAAE,CAAC,EAAE;gBACP,CAAC,cAAE,CAAC,KAAK,CAAC,EAAE,GAAG;gBACf,CAAC,cAAE,CAAC,EAAE,CAAC,EAAE,IAAI;aACd;SACF,CAAC;IACJ,CAAC;CACF,CAAC","sourcesContent":["import { Op } from 'sequelize';\n\nexport default {\n  $notIn(val, ctx) {\n    return {\n      [Op.or]: {\n        [Op.notIn]: val,\n        [Op.is]: null,\n      },\n    };\n  },\n};\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/database",
-  "version": "0.7.0-alpha.33",
+  "version": "0.7.0-alpha.34",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -17,7 +17,7 @@
     "build:esm": "tsc --project tsconfig.build.json --module es2015 --outDir esm"
   },
   "dependencies": {
-    "@nocobase/utils": "0.7.0-alpha.33",
+    "@nocobase/utils": "0.7.0-alpha.34",
     "async-mutex": "^0.3.2",
     "deepmerge": "^4.2.2",
     "flat": "^5.0.2",
@@ -29,5 +29,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/database"
   },
-  "gitHead": "c4b5f4f84b18c2d8bc40f82947b9338e2f620984"
+  "gitHead": "48b2b4bc7bbc39533e461d34d7f026a4ad1a9b5c"
 }

package/src/__tests__/operator/notIn.test.ts

@@ -0,0 +1,33 @@
+import { mockDatabase } from '../index';
+import Database from '../../database';
+
+describe('ne operator', () => {
+  let db: Database;
+  let Test;
+  beforeEach(async () => {
+    db = mockDatabase({});
+
+    Test = db.collection({
+      name: 'tests',
+      fields: [{ type: 'string', name: 'name' }],
+    });
+
+    await db.sync();
+  });
+
+  afterEach(async () => {
+    await db.close();
+  });
+
+  it('should notIn with null', async () => {
+    await db.getRepository('tests').create({});
+
+    const results = await db.getRepository('tests').count({
+      filter: {
+        'name.$notIn': ['123'],
+      },
+    });
+
+    expect(results).toEqual(1);
+  });
+});

package/src/operators/index.ts

@@ -5,4 +5,5 @@ export default {
   ...require('./empty').default,
   ...require('./string').default,
   ...require('./ne').default,
+  ...require('./notIn').default,
 };

package/src/operators/notIn.ts

@@ -0,0 +1,12 @@
+import { Op } from 'sequelize';
+
+export default {
+  $notIn(val, ctx) {
+    return {
+      [Op.or]: {
+        [Op.notIn]: val,
+        [Op.is]: null,
+      },
+    };
+  },
+};