@tsed/objection 6.132.0 → 6.133.0

package/lib/cjs/components/createIdColumn.js

@@ -2,15 +2,20 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createIdColumn = void 0;
 const ColumnTypesContainer_1 = require("../services/ColumnTypesContainer");
+const crypto_1 = require("crypto");
 /**
  * @ignore
  */
 function createIdColumn(table, { entity, options }) {
-    if (options.type === "bigIncrements") {
-        table.bigIncrements(entity.propertyName).primary();
-    }
-    else {
-        table.increments(entity.propertyName).primary();
+    switch (options.type) {
+        case "bigIncrements":
+            table.bigIncrements(entity.propertyName).primary();
+            break;
+        case "increments":
+            table.increments(entity.propertyName).primary();
+            break;
+        case "uuid":
+            table.uuid(entity.propertyName).primary().defaultTo((0, crypto_1.randomUUID)());
     }
 }
 exports.createIdColumn = createIdColumn;

package/lib/cjs/components/createIdColumn.js.map

@@ -1 +1 @@
-{"version":3,"file":"createIdColumn.js","sourceRoot":"","sources":["../../../src/components/createIdColumn.ts"],"names":[],"mappings":";;;AACA,2EAAsE;AAGtE;;GAEG;AACH,SAAgB,cAAc,CAAC,KAAwB,EAAE,EAAC,MAAM,EAAE,OAAO,EAAY;IACnF,IAAI,OAAO,CAAC,IAAI,KAAK,eAAe,EAAE;QACpC,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,OAAO,EAAE,CAAC;KACpD;SAAM;QACL,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,OAAO,EAAE,CAAC;KACjD;AACH,CAAC;AAND,wCAMC;AAED,2CAAoB,CAAC,GAAG,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC","sourcesContent":["import type {Knex} from \"knex\";\nimport {ColumnTypesContainer} from \"../services/ColumnTypesContainer\";\nimport {ColumnCtx} from \"../utils/getColumnCtx\";\n\n/**\n * @ignore\n */\nexport function createIdColumn(table: Knex.TableBuilder, {entity, options}: ColumnCtx) {\n  if (options.type === \"bigIncrements\") {\n    table.bigIncrements(entity.propertyName).primary();\n  } else {\n    table.increments(entity.propertyName).primary();\n  }\n}\n\nColumnTypesContainer.set(\"idColumn\", createIdColumn);\n"]}
+{"version":3,"file":"createIdColumn.js","sourceRoot":"","sources":["../../../src/components/createIdColumn.ts"],"names":[],"mappings":";;;AACA,2EAAsE;AAEtE,mCAAkC;AAElC;;GAEG;AACH,SAAgB,cAAc,CAAC,KAAwB,EAAE,EAAC,MAAM,EAAE,OAAO,EAAY;IACnF,QAAQ,OAAO,CAAC,IAAI,EAAE;QACpB,KAAK,eAAe;YAClB,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,OAAO,EAAE,CAAC;YACnD,MAAM;QACR,KAAK,YAAY;YACf,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,OAAO,EAAE,CAAC;YAChD,MAAM;QACR,KAAK,MAAM;YACT,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,OAAO,EAAE,CAAC,SAAS,CAAC,IAAA,mBAAU,GAAE,CAAC,CAAC;KACrE;AACH,CAAC;AAXD,wCAWC;AAED,2CAAoB,CAAC,GAAG,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC","sourcesContent":["import {ColumnCtx} from \"../utils/getColumnCtx\";\nimport {ColumnTypesContainer} from \"../services/ColumnTypesContainer\";\nimport type {Knex} from \"knex\";\nimport {randomUUID} from \"crypto\";\n\n/**\n * @ignore\n */\nexport function createIdColumn(table: Knex.TableBuilder, {entity, options}: ColumnCtx) {\n  switch (options.type) {\n    case \"bigIncrements\":\n      table.bigIncrements(entity.propertyName).primary();\n      break;\n    case \"increments\":\n      table.increments(entity.propertyName).primary();\n      break;\n    case \"uuid\":\n      table.uuid(entity.propertyName).primary().defaultTo(randomUUID());\n  }\n}\n\nColumnTypesContainer.set(\"idColumn\", createIdColumn);\n"]}

package/lib/cjs/decorators/idColumn.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IdColumn = void 0;
-const core_1 = require("@tsed/core");
+const columnOptions_1 = require("./columnOptions");
 const schema_1 = require("@tsed/schema");
 const defineStaticGetter_1 = require("../utils/defineStaticGetter");
-const columnOptions_1 = require("./columnOptions");
+const core_1 = require("@tsed/core");
 /**
  *
  * @param type

package/lib/cjs/decorators/idColumn.js.map

@@ -1 +1 @@
-{"version":3,"file":"idColumn.js","sourceRoot":"","sources":["../../../src/decorators/idColumn.ts"],"names":[],"mappings":";;;AAAA,qCAAyC;AACzC,yCAAsC;AACtC,oEAA+D;AAC/D,mDAA8C;AAE9C;;;;;GAKG;AACH,SAAgB,QAAQ,CAAC,OAAuC,YAAY;IAC1E,OAAO,IAAA,oBAAa,EAClB,IAAA,iBAAQ,GAAE,EACV,IAAA,6BAAa,EAAC;QACZ,UAAU,EAAE,UAAU;QACtB,OAAO,EAAE;YACP,IAAI;SACL;KACF,CAAC,EACF,CAAC,MAAW,EAAE,WAAmB,EAAE,EAAE;QACnC,IAAA,uCAAkB,EAAC,MAAM,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,CAAC;IAC5D,CAAC,CACF,CAAC;AACJ,CAAC;AAbD,4BAaC","sourcesContent":["import {useDecorators} from \"@tsed/core\";\nimport {Property} from \"@tsed/schema\";\nimport {defineStaticGetter} from \"../utils/defineStaticGetter\";\nimport {ColumnOptions} from \"./columnOptions\";\n\n/**\n *\n * @param type\n * @decorator\n * @objection\n */\nexport function IdColumn(type: \"increments\" | \"bigIncrements\" = \"increments\"): PropertyDecorator {\n  return useDecorators(\n    Property(),\n    ColumnOptions({\n      columnType: \"idColumn\",\n      options: {\n        type\n      }\n    }),\n    (target: any, propertyKey: string) => {\n      defineStaticGetter(target, \"idColumn\", () => propertyKey);\n    }\n  );\n}\n"]}
+{"version":3,"file":"idColumn.js","sourceRoot":"","sources":["../../../src/decorators/idColumn.ts"],"names":[],"mappings":";;;AAAA,mDAA8C;AAC9C,yCAAsC;AACtC,oEAA+D;AAC/D,qCAAyC;AAEzC;;;;;GAKG;AACH,SAAgB,QAAQ,CAAC,OAAgD,YAAY;IACnF,OAAO,IAAA,oBAAa,EAClB,IAAA,iBAAQ,GAAE,EACV,IAAA,6BAAa,EAAC;QACZ,UAAU,EAAE,UAAU;QACtB,OAAO,EAAE;YACP,IAAI;SACL;KACF,CAAC,EACF,CAAC,MAAW,EAAE,WAAmB,EAAE,EAAE;QACnC,IAAA,uCAAkB,EAAC,MAAM,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,CAAC;IAC5D,CAAC,CACF,CAAC;AACJ,CAAC;AAbD,4BAaC","sourcesContent":["import {ColumnOptions} from \"./columnOptions\";\nimport {Property} from \"@tsed/schema\";\nimport {defineStaticGetter} from \"../utils/defineStaticGetter\";\nimport {useDecorators} from \"@tsed/core\";\n\n/**\n *\n * @param type\n * @decorator\n * @objection\n */\nexport function IdColumn(type: \"uuid\" | \"increments\" | \"bigIncrements\" = \"increments\"): PropertyDecorator {\n  return useDecorators(\n    Property(),\n    ColumnOptions({\n      columnType: \"idColumn\",\n      options: {\n        type\n      }\n    }),\n    (target: any, propertyKey: string) => {\n      defineStaticGetter(target, \"idColumn\", () => propertyKey);\n    }\n  );\n}\n"]}

package/lib/esm/components/createIdColumn.js

@@ -1,13 +1,18 @@
 import { ColumnTypesContainer } from "../services/ColumnTypesContainer.js";
+import { randomUUID } from "crypto";
 /**
  * @ignore
  */
 export function createIdColumn(table, { entity, options }) {
-    if (options.type === "bigIncrements") {
-        table.bigIncrements(entity.propertyName).primary();
-    }
-    else {
-        table.increments(entity.propertyName).primary();
+    switch (options.type) {
+        case "bigIncrements":
+            table.bigIncrements(entity.propertyName).primary();
+            break;
+        case "increments":
+            table.increments(entity.propertyName).primary();
+            break;
+        case "uuid":
+            table.uuid(entity.propertyName).primary().defaultTo(randomUUID());
     }
 }
 ColumnTypesContainer.set("idColumn", createIdColumn);

package/lib/esm/components/createIdColumn.js.map

@@ -1 +1 @@
-{"version":3,"file":"createIdColumn.js","sourceRoot":"","sources":["../../../src/components/createIdColumn.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,oBAAoB,EAAC,MAAM,kCAAkC,CAAC;AAGtE;;GAEG;AACH,MAAM,UAAU,cAAc,CAAC,KAAwB,EAAE,EAAC,MAAM,EAAE,OAAO,EAAY;IACnF,IAAI,OAAO,CAAC,IAAI,KAAK,eAAe,EAAE;QACpC,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,OAAO,EAAE,CAAC;KACpD;SAAM;QACL,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,OAAO,EAAE,CAAC;KACjD;AACH,CAAC;AAED,oBAAoB,CAAC,GAAG,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC","sourcesContent":["import type {Knex} from \"knex\";\nimport {ColumnTypesContainer} from \"../services/ColumnTypesContainer\";\nimport {ColumnCtx} from \"../utils/getColumnCtx\";\n\n/**\n * @ignore\n */\nexport function createIdColumn(table: Knex.TableBuilder, {entity, options}: ColumnCtx) {\n  if (options.type === \"bigIncrements\") {\n    table.bigIncrements(entity.propertyName).primary();\n  } else {\n    table.increments(entity.propertyName).primary();\n  }\n}\n\nColumnTypesContainer.set(\"idColumn\", createIdColumn);\n"]}
+{"version":3,"file":"createIdColumn.js","sourceRoot":"","sources":["../../../src/components/createIdColumn.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,oBAAoB,EAAC,MAAM,kCAAkC,CAAC;AAEtE,OAAO,EAAC,UAAU,EAAC,MAAM,QAAQ,CAAC;AAElC;;GAEG;AACH,MAAM,UAAU,cAAc,CAAC,KAAwB,EAAE,EAAC,MAAM,EAAE,OAAO,EAAY;IACnF,QAAQ,OAAO,CAAC,IAAI,EAAE;QACpB,KAAK,eAAe;YAClB,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,OAAO,EAAE,CAAC;YACnD,MAAM;QACR,KAAK,YAAY;YACf,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,OAAO,EAAE,CAAC;YAChD,MAAM;QACR,KAAK,MAAM;YACT,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,OAAO,EAAE,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC,CAAC;KACrE;AACH,CAAC;AAED,oBAAoB,CAAC,GAAG,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC","sourcesContent":["import {ColumnCtx} from \"../utils/getColumnCtx\";\nimport {ColumnTypesContainer} from \"../services/ColumnTypesContainer\";\nimport type {Knex} from \"knex\";\nimport {randomUUID} from \"crypto\";\n\n/**\n * @ignore\n */\nexport function createIdColumn(table: Knex.TableBuilder, {entity, options}: ColumnCtx) {\n  switch (options.type) {\n    case \"bigIncrements\":\n      table.bigIncrements(entity.propertyName).primary();\n      break;\n    case \"increments\":\n      table.increments(entity.propertyName).primary();\n      break;\n    case \"uuid\":\n      table.uuid(entity.propertyName).primary().defaultTo(randomUUID());\n  }\n}\n\nColumnTypesContainer.set(\"idColumn\", createIdColumn);\n"]}

package/lib/esm/decorators/idColumn.js

@@ -1,7 +1,7 @@
-import { useDecorators } from "@tsed/core";
+import { ColumnOptions } from "./columnOptions.js";
 import { Property } from "@tsed/schema";
 import { defineStaticGetter } from "../utils/defineStaticGetter.js";
-import { ColumnOptions } from "./columnOptions.js";
+import { useDecorators } from "@tsed/core";
 /**
  *
  * @param type

package/lib/esm/decorators/idColumn.js.map

@@ -1 +1 @@
-{"version":3,"file":"idColumn.js","sourceRoot":"","sources":["../../../src/decorators/idColumn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAC,MAAM,YAAY,CAAC;AACzC,OAAO,EAAC,QAAQ,EAAC,MAAM,cAAc,CAAC;AACtC,OAAO,EAAC,kBAAkB,EAAC,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAE9C;;;;;GAKG;AACH,MAAM,UAAU,QAAQ,CAAC,OAAuC,YAAY;IAC1E,OAAO,aAAa,CAClB,QAAQ,EAAE,EACV,aAAa,CAAC;QACZ,UAAU,EAAE,UAAU;QACtB,OAAO,EAAE;YACP,IAAI;SACL;KACF,CAAC,EACF,CAAC,MAAW,EAAE,WAAmB,EAAE,EAAE;QACnC,kBAAkB,CAAC,MAAM,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,CAAC;IAC5D,CAAC,CACF,CAAC;AACJ,CAAC","sourcesContent":["import {useDecorators} from \"@tsed/core\";\nimport {Property} from \"@tsed/schema\";\nimport {defineStaticGetter} from \"../utils/defineStaticGetter\";\nimport {ColumnOptions} from \"./columnOptions\";\n\n/**\n *\n * @param type\n * @decorator\n * @objection\n */\nexport function IdColumn(type: \"increments\" | \"bigIncrements\" = \"increments\"): PropertyDecorator {\n  return useDecorators(\n    Property(),\n    ColumnOptions({\n      columnType: \"idColumn\",\n      options: {\n        type\n      }\n    }),\n    (target: any, propertyKey: string) => {\n      defineStaticGetter(target, \"idColumn\", () => propertyKey);\n    }\n  );\n}\n"]}
+{"version":3,"file":"idColumn.js","sourceRoot":"","sources":["../../../src/decorators/idColumn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAC,QAAQ,EAAC,MAAM,cAAc,CAAC;AACtC,OAAO,EAAC,kBAAkB,EAAC,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAC,aAAa,EAAC,MAAM,YAAY,CAAC;AAEzC;;;;;GAKG;AACH,MAAM,UAAU,QAAQ,CAAC,OAAgD,YAAY;IACnF,OAAO,aAAa,CAClB,QAAQ,EAAE,EACV,aAAa,CAAC;QACZ,UAAU,EAAE,UAAU;QACtB,OAAO,EAAE;YACP,IAAI;SACL;KACF,CAAC,EACF,CAAC,MAAW,EAAE,WAAmB,EAAE,EAAE;QACnC,kBAAkB,CAAC,MAAM,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,CAAC;IAC5D,CAAC,CACF,CAAC;AACJ,CAAC","sourcesContent":["import {ColumnOptions} from \"./columnOptions\";\nimport {Property} from \"@tsed/schema\";\nimport {defineStaticGetter} from \"../utils/defineStaticGetter\";\nimport {useDecorators} from \"@tsed/core\";\n\n/**\n *\n * @param type\n * @decorator\n * @objection\n */\nexport function IdColumn(type: \"uuid\" | \"increments\" | \"bigIncrements\" = \"increments\"): PropertyDecorator {\n  return useDecorators(\n    Property(),\n    ColumnOptions({\n      columnType: \"idColumn\",\n      options: {\n        type\n      }\n    }),\n    (target: any, propertyKey: string) => {\n      defineStaticGetter(target, \"idColumn\", () => propertyKey);\n    }\n  );\n}\n"]}

package/lib/types/components/createIdColumn.d.ts

@@ -1,5 +1,5 @@
-import type { Knex } from "knex";
 import { ColumnCtx } from "../utils/getColumnCtx";
+import type { Knex } from "knex";
 /**
  * @ignore
  */

package/lib/types/decorators/idColumn.d.ts

@@ -4,4 +4,4 @@
  * @decorator
  * @objection
  */
-export declare function IdColumn(type?: "increments" | "bigIncrements"): PropertyDecorator;
+export declare function IdColumn(type?: "uuid" | "increments" | "bigIncrements"): PropertyDecorator;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tsed/objection",
-  "version": "6.132.0",
+  "version": "6.133.0",
   "description": "Objection.js package for Ts.ED framework",
   "private": false,
   "source": "./src/index.ts",
@@ -24,21 +24,21 @@
     "tslib": "2.4.0"
   },
   "devDependencies": {
-    "@tsed/ajv": "6.132.0",
-    "@tsed/core": "6.132.0",
-    "@tsed/di": "6.132.0",
-    "@tsed/json-mapper": "6.132.0",
-    "@tsed/schema": "6.132.0",
+    "@tsed/ajv": "6.133.0",
+    "@tsed/core": "6.133.0",
+    "@tsed/di": "6.133.0",
+    "@tsed/json-mapper": "6.133.0",
+    "@tsed/schema": "6.133.0",
     "knex": "^0.95.11",
     "objection": "^2.2.15",
     "sqlite3": "^5.0.2"
   },
   "peerDependencies": {
-    "@tsed/ajv": "^6.132.0",
-    "@tsed/core": "^6.132.0",
-    "@tsed/di": "^6.132.0",
-    "@tsed/json-mapper": "^6.132.0",
-    "@tsed/schema": "^6.132.0",
+    "@tsed/ajv": "^6.133.0",
+    "@tsed/core": "^6.133.0",
+    "@tsed/di": "^6.133.0",
+    "@tsed/json-mapper": "^6.133.0",
+    "@tsed/schema": "^6.133.0",
     "knex": ">=0.94.0",
     "objection": ">=2.0.0"
   },