npm - sonamu - Versions diffs - 0.4.8 → 0.4.9 - Mend

sonamu 0.4.8 → 0.4.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (29) hide show

package/dist/database/drivers/knex/base-model.js CHANGED Viewed

@@ -1,28 +1,28 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
-var _chunkIEXW7P6Ajs = require('../../../chunk-IEXW7P6A.js');
+var _chunkIDNBP4MHjs = require('../../../chunk-IDNBP4MH.js');
-var _chunkWZJODZL6js = require('../../../chunk-WZJODZL6.js');
+var _chunkGHF56FO6js = require('../../../chunk-GHF56FO6.js');
-var _chunkFXWN5PEOjs = require('../../../chunk-FXWN5PEO.js');
+var _chunk2VEHSKNAjs = require('../../../chunk-2VEHSKNA.js');
 // src/database/drivers/knex/base-model.ts
-var BaseModelClass = class extends _chunkIEXW7P6Ajs.BaseModelClassAbstract {
+var BaseModelClass = class extends _chunkIDNBP4MHjs.BaseModelClassAbstract {
   getDB(which) {
-    return _chunkFXWN5PEOjs.DB.getDB(which);
+    return _chunk2VEHSKNAjs.DB.getDB(which);
   }
   async destroy() {
-    return _chunkFXWN5PEOjs.DB.destroy();
+    return _chunk2VEHSKNAjs.DB.destroy();
   }
   getUpsertBuilder() {
-    return new (0, _chunkWZJODZL6js.UpsertBuilder)();
+    return new (0, _chunkGHF56FO6js.UpsertBuilder)();
   }
   applyJoins(clonedQb, joins) {
     for (const join of joins) {
-      if (_chunkFXWN5PEOjs.isCustomJoinClause.call(void 0, join)) {
+      if (_chunk2VEHSKNAjs.isCustomJoinClause.call(void 0, join)) {
         if (join.join === "inner") {
           clonedQb.qb = clonedQb.qb.innerJoin(
             `${join.table} as ${join.as}`,

package/dist/database/drivers/knex/base-model.mjs CHANGED Viewed

@@ -1,13 +1,13 @@
 import {
   BaseModelClassAbstract
-} from "../../../chunk-OBPWSOYN.mjs";
+} from "../../../chunk-L3RJSG2K.mjs";
 import {
   UpsertBuilder
-} from "../../../chunk-IEP5SWTY.mjs";
+} from "../../../chunk-AK547YMV.mjs";
 import {
   DB,
   isCustomJoinClause
-} from "../../../chunk-VBBKB2LD.mjs";
+} from "../../../chunk-IV7ZWWBN.mjs";
 import "../../../chunk-PTFDTOJU.mjs";
 // src/database/drivers/knex/base-model.ts

package/dist/database/drivers/kysely/base-model.js CHANGED Viewed

@@ -1,30 +1,30 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-var _chunkIEXW7P6Ajs = require('../../../chunk-IEXW7P6A.js');
+var _chunkIDNBP4MHjs = require('../../../chunk-IDNBP4MH.js');
-var _chunkWZJODZL6js = require('../../../chunk-WZJODZL6.js');
+var _chunkGHF56FO6js = require('../../../chunk-GHF56FO6.js');
-var _chunkFXWN5PEOjs = require('../../../chunk-FXWN5PEO.js');
+var _chunk2VEHSKNAjs = require('../../../chunk-2VEHSKNA.js');
 // src/database/drivers/kysely/base-model.ts
 var _inflection = require('inflection'); var _inflection2 = _interopRequireDefault(_inflection);
-var BaseModelClass = class extends _chunkIEXW7P6Ajs.BaseModelClassAbstract {
+var BaseModelClass = class extends _chunkIDNBP4MHjs.BaseModelClassAbstract {
   getDB(which) {
-    return _chunkFXWN5PEOjs.DB.getDB(which);
+    return _chunk2VEHSKNAjs.DB.getDB(which);
   }
   async destroy() {
-    return _chunkFXWN5PEOjs.DB.destroy();
+    return _chunk2VEHSKNAjs.DB.destroy();
   }
   getUpsertBuilder() {
-    return new (0, _chunkWZJODZL6js.UpsertBuilder)();
+    return new (0, _chunkGHF56FO6js.UpsertBuilder)();
   }
   applyJoins(clonedQb, joins) {
     for (const join of joins) {
-      if (_chunkFXWN5PEOjs.isCustomJoinClause.call(void 0, join)) {
+      if (_chunk2VEHSKNAjs.isCustomJoinClause.call(void 0, join)) {
         throw new Error("Custom join clause is not supported in Kysely");
       }
       if (join.join === "inner") {
@@ -48,7 +48,7 @@ var BaseModelClass = class extends _chunkIEXW7P6Ajs.BaseModelClassAbstract {
     if (!column) {
       throw new Error("parseOrderBy: Invalid column");
     }
-    const entity = _chunkFXWN5PEOjs.EntityManager.get(_inflection2.default.classify(table));
+    const entity = _chunk2VEHSKNAjs.EntityManager.get(_inflection2.default.classify(table));
     if (!entity.props.find((p) => p.name === column)) {
       throw new Error("parseOrderBy: \uD604\uC7AC \uC5D4\uD2F0\uD2F0\uC5D0 \uC874\uC7AC\uD558\uC9C0 \uC54A\uB294 \uCEEC\uB7FC\uC785\uB2C8\uB2E4: ");
     }

package/dist/database/drivers/kysely/base-model.mjs CHANGED Viewed

@@ -1,14 +1,14 @@
 import {
   BaseModelClassAbstract
-} from "../../../chunk-OBPWSOYN.mjs";
+} from "../../../chunk-L3RJSG2K.mjs";
 import {
   UpsertBuilder
-} from "../../../chunk-IEP5SWTY.mjs";
+} from "../../../chunk-AK547YMV.mjs";
 import {
   DB,
   EntityManager,
   isCustomJoinClause
-} from "../../../chunk-VBBKB2LD.mjs";
+} from "../../../chunk-IV7ZWWBN.mjs";
 import "../../../chunk-PTFDTOJU.mjs";
 // src/database/drivers/kysely/base-model.ts

package/dist/index.js CHANGED Viewed

@@ -2,11 +2,11 @@
-var _chunkZNWZQLRNjs = require('./chunk-ZNWZQLRN.js');
+var _chunkLD7OHPVKjs = require('./chunk-LD7OHPVK.js');
-var _chunkWZJODZL6js = require('./chunk-WZJODZL6.js');
+var _chunkGHF56FO6js = require('./chunk-GHF56FO6.js');
@@ -88,13 +88,13 @@ var _chunkWZJODZL6js = require('./chunk-WZJODZL6.js');
-var _chunkFXWN5PEOjs = require('./chunk-FXWN5PEO.js');
+var _chunk2VEHSKNAjs = require('./chunk-2VEHSKNA.js');
 // src/exceptions/error-handler.ts
 function setupErrorHandler(server) {
   server.setErrorHandler((error, request, reply) => {
     error.statusCode ??= 400;
-    if (_chunkFXWN5PEOjs.isSoException.call(void 0, error) && error.payload && Array.isArray(error.payload)) {
+    if (_chunk2VEHSKNAjs.isSoException.call(void 0, error) && error.payload && Array.isArray(error.payload)) {
       const issues = error.payload;
       const [issue] = issues;
       const message = `${issue.message} (${issue.path.join("/")})`;
@@ -316,13 +316,13 @@ var i = {
 function index(columns) {
   return {
     type: "index",
-    columns: _chunkFXWN5PEOjs.asArray.call(void 0, columns)
+    columns: _chunk2VEHSKNAjs.asArray.call(void 0, columns)
   };
 }
 function unique(columns) {
   return {
     type: "unique",
-    columns: _chunkFXWN5PEOjs.asArray.call(void 0, columns)
+    columns: _chunk2VEHSKNAjs.asArray.call(void 0, columns)
   };
 }
@@ -414,5 +414,5 @@ function unique(columns) {
-exports.AlreadyProcessedException = _chunkFXWN5PEOjs.AlreadyProcessedException; exports.ApiParamType = _chunkFXWN5PEOjs.ApiParamType; exports.BadRequestException = _chunkFXWN5PEOjs.BadRequestException; exports.DB = _chunkFXWN5PEOjs.DB; exports.DBKnexClass = _chunkFXWN5PEOjs.DBKnexClass; exports.DBKyselyClass = _chunkFXWN5PEOjs.DBKyselyClass; exports.DuplicateRowException = _chunkFXWN5PEOjs.DuplicateRowException; exports.Entity = _chunkFXWN5PEOjs.Entity; exports.EntityManager = _chunkFXWN5PEOjs.EntityManager; exports.FixtureManager = _chunkZNWZQLRNjs.FixtureManager; exports.FixtureManagerClass = _chunkZNWZQLRNjs.FixtureManagerClass; exports.GenerateOptions = _chunkFXWN5PEOjs.GenerateOptions; exports.InternalServerErrorException = _chunkFXWN5PEOjs.InternalServerErrorException; exports.Migrator = _chunkZNWZQLRNjs.Migrator; exports.NotFoundException = _chunkFXWN5PEOjs.NotFoundException; exports.PathAndCode = _chunkFXWN5PEOjs.PathAndCode; exports.RenderingNode = _chunkFXWN5PEOjs.RenderingNode; exports.SQLDateTimeString = _chunkFXWN5PEOjs.SQLDateTimeString; exports.ServiceUnavailableException = _chunkFXWN5PEOjs.ServiceUnavailableException; exports.SoException = _chunkFXWN5PEOjs.SoException; exports.Sonamu = _chunkFXWN5PEOjs.Sonamu; exports.SonamuQueryMode = _chunkFXWN5PEOjs.SonamuQueryMode; exports.Syncer = _chunkFXWN5PEOjs.Syncer; exports.TargetNotFoundException = _chunkFXWN5PEOjs.TargetNotFoundException; exports.TemplateKey = _chunkFXWN5PEOjs.TemplateKey; exports.TemplateOptions = _chunkFXWN5PEOjs.TemplateOptions; exports.UnauthorizedException = _chunkFXWN5PEOjs.UnauthorizedException; exports.UpsertBuilder = _chunkWZJODZL6js.UpsertBuilder; exports.api = _chunkFXWN5PEOjs.api; exports.apiParamToTsCode = _chunkFXWN5PEOjs.apiParamToTsCode; exports.apiParamTypeToTsType = _chunkFXWN5PEOjs.apiParamTypeToTsType; exports.asArray = _chunkFXWN5PEOjs.asArray; exports.findApiRootPath = _chunkFXWN5PEOjs.findApiRootPath; exports.findAppRootPath = _chunkFXWN5PEOjs.findAppRootPath; exports.getTextTypeLength = _chunkFXWN5PEOjs.getTextTypeLength; exports.getZodObjectFromApi = _chunkFXWN5PEOjs.getZodObjectFromApi; exports.getZodObjectFromApiParams = _chunkFXWN5PEOjs.getZodObjectFromApiParams; exports.getZodTypeFromApiParamType = _chunkFXWN5PEOjs.getZodTypeFromApiParamType; exports.globAsync = _chunkFXWN5PEOjs.globAsync; exports.hydrate = _chunkFXWN5PEOjs.hydrate; exports.i = i; exports.importMultiple = _chunkFXWN5PEOjs.importMultiple; exports.isBelongsToOneRelationProp = _chunkFXWN5PEOjs.isBelongsToOneRelationProp; exports.isBigIntegerProp = _chunkFXWN5PEOjs.isBigIntegerProp; exports.isBooleanProp = _chunkFXWN5PEOjs.isBooleanProp; exports.isCustomJoinClause = _chunkFXWN5PEOjs.isCustomJoinClause; exports.isDaemonServer = _chunkFXWN5PEOjs.isDaemonServer; exports.isDateProp = _chunkFXWN5PEOjs.isDateProp; exports.isDateTimeProp = _chunkFXWN5PEOjs.isDateTimeProp; exports.isDecimalProp = _chunkFXWN5PEOjs.isDecimalProp; exports.isDevelopment = _chunkFXWN5PEOjs.isDevelopment; exports.isDoubleProp = _chunkFXWN5PEOjs.isDoubleProp; exports.isEnumProp = _chunkFXWN5PEOjs.isEnumProp; exports.isFloatProp = _chunkFXWN5PEOjs.isFloatProp; exports.isHasManyRelationProp = _chunkFXWN5PEOjs.isHasManyRelationProp; exports.isInDocker = _chunkFXWN5PEOjs.isInDocker; exports.isIntegerProp = _chunkFXWN5PEOjs.isIntegerProp; exports.isJsonProp = _chunkFXWN5PEOjs.isJsonProp; exports.isKnexError = _chunkFXWN5PEOjs.isKnexError; exports.isKyselyError = _chunkFXWN5PEOjs.isKyselyError; exports.isLocal = _chunkFXWN5PEOjs.isLocal; exports.isManyToManyRelationProp = _chunkFXWN5PEOjs.isManyToManyRelationProp; exports.isOneToOneRelationProp = _chunkFXWN5PEOjs.isOneToOneRelationProp; exports.isProduction = _chunkFXWN5PEOjs.isProduction; exports.isRefField = _chunkWZJODZL6js.isRefField; exports.isRelationProp = _chunkFXWN5PEOjs.isRelationProp; exports.isRemote = _chunkFXWN5PEOjs.isRemote; exports.isSoException = _chunkFXWN5PEOjs.isSoException; exports.isStaging = _chunkFXWN5PEOjs.isStaging; exports.isStringProp = _chunkFXWN5PEOjs.isStringProp; exports.isTest = _chunkFXWN5PEOjs.isTest; exports.isTextProp = _chunkFXWN5PEOjs.isTextProp; exports.isTimeProp = _chunkFXWN5PEOjs.isTimeProp; exports.isTimestampProp = _chunkFXWN5PEOjs.isTimestampProp; exports.isUuidProp = _chunkFXWN5PEOjs.isUuidProp; exports.isVirtualProp = _chunkFXWN5PEOjs.isVirtualProp; exports.nonNullable = _chunkFXWN5PEOjs.nonNullable; exports.objToMap = _chunkFXWN5PEOjs.objToMap; exports.p = p; exports.propNodeToZodTypeDef = _chunkFXWN5PEOjs.propNodeToZodTypeDef; exports.propToZodTypeDef = _chunkFXWN5PEOjs.propToZodTypeDef; exports.registeredApis = _chunkFXWN5PEOjs.registeredApis; exports.serializeZodType = _chunkFXWN5PEOjs.serializeZodType; exports.setupErrorHandler = setupErrorHandler; exports.unwrapPromiseOnce = _chunkFXWN5PEOjs.unwrapPromiseOnce; exports.zArrayable = _chunkFXWN5PEOjs.zArrayable; exports.zodTypeToTsTypeDef = _chunkFXWN5PEOjs.zodTypeToTsTypeDef; exports.zodTypeToZodCode = _chunkFXWN5PEOjs.zodTypeToZodCode;
+exports.AlreadyProcessedException = _chunk2VEHSKNAjs.AlreadyProcessedException; exports.ApiParamType = _chunk2VEHSKNAjs.ApiParamType; exports.BadRequestException = _chunk2VEHSKNAjs.BadRequestException; exports.DB = _chunk2VEHSKNAjs.DB; exports.DBKnexClass = _chunk2VEHSKNAjs.DBKnexClass; exports.DBKyselyClass = _chunk2VEHSKNAjs.DBKyselyClass; exports.DuplicateRowException = _chunk2VEHSKNAjs.DuplicateRowException; exports.Entity = _chunk2VEHSKNAjs.Entity; exports.EntityManager = _chunk2VEHSKNAjs.EntityManager; exports.FixtureManager = _chunkLD7OHPVKjs.FixtureManager; exports.FixtureManagerClass = _chunkLD7OHPVKjs.FixtureManagerClass; exports.GenerateOptions = _chunk2VEHSKNAjs.GenerateOptions; exports.InternalServerErrorException = _chunk2VEHSKNAjs.InternalServerErrorException; exports.Migrator = _chunkLD7OHPVKjs.Migrator; exports.NotFoundException = _chunk2VEHSKNAjs.NotFoundException; exports.PathAndCode = _chunk2VEHSKNAjs.PathAndCode; exports.RenderingNode = _chunk2VEHSKNAjs.RenderingNode; exports.SQLDateTimeString = _chunk2VEHSKNAjs.SQLDateTimeString; exports.ServiceUnavailableException = _chunk2VEHSKNAjs.ServiceUnavailableException; exports.SoException = _chunk2VEHSKNAjs.SoException; exports.Sonamu = _chunk2VEHSKNAjs.Sonamu; exports.SonamuQueryMode = _chunk2VEHSKNAjs.SonamuQueryMode; exports.Syncer = _chunk2VEHSKNAjs.Syncer; exports.TargetNotFoundException = _chunk2VEHSKNAjs.TargetNotFoundException; exports.TemplateKey = _chunk2VEHSKNAjs.TemplateKey; exports.TemplateOptions = _chunk2VEHSKNAjs.TemplateOptions; exports.UnauthorizedException = _chunk2VEHSKNAjs.UnauthorizedException; exports.UpsertBuilder = _chunkGHF56FO6js.UpsertBuilder; exports.api = _chunk2VEHSKNAjs.api; exports.apiParamToTsCode = _chunk2VEHSKNAjs.apiParamToTsCode; exports.apiParamTypeToTsType = _chunk2VEHSKNAjs.apiParamTypeToTsType; exports.asArray = _chunk2VEHSKNAjs.asArray; exports.findApiRootPath = _chunk2VEHSKNAjs.findApiRootPath; exports.findAppRootPath = _chunk2VEHSKNAjs.findAppRootPath; exports.getTextTypeLength = _chunk2VEHSKNAjs.getTextTypeLength; exports.getZodObjectFromApi = _chunk2VEHSKNAjs.getZodObjectFromApi; exports.getZodObjectFromApiParams = _chunk2VEHSKNAjs.getZodObjectFromApiParams; exports.getZodTypeFromApiParamType = _chunk2VEHSKNAjs.getZodTypeFromApiParamType; exports.globAsync = _chunk2VEHSKNAjs.globAsync; exports.hydrate = _chunk2VEHSKNAjs.hydrate; exports.i = i; exports.importMultiple = _chunk2VEHSKNAjs.importMultiple; exports.isBelongsToOneRelationProp = _chunk2VEHSKNAjs.isBelongsToOneRelationProp; exports.isBigIntegerProp = _chunk2VEHSKNAjs.isBigIntegerProp; exports.isBooleanProp = _chunk2VEHSKNAjs.isBooleanProp; exports.isCustomJoinClause = _chunk2VEHSKNAjs.isCustomJoinClause; exports.isDaemonServer = _chunk2VEHSKNAjs.isDaemonServer; exports.isDateProp = _chunk2VEHSKNAjs.isDateProp; exports.isDateTimeProp = _chunk2VEHSKNAjs.isDateTimeProp; exports.isDecimalProp = _chunk2VEHSKNAjs.isDecimalProp; exports.isDevelopment = _chunk2VEHSKNAjs.isDevelopment; exports.isDoubleProp = _chunk2VEHSKNAjs.isDoubleProp; exports.isEnumProp = _chunk2VEHSKNAjs.isEnumProp; exports.isFloatProp = _chunk2VEHSKNAjs.isFloatProp; exports.isHasManyRelationProp = _chunk2VEHSKNAjs.isHasManyRelationProp; exports.isInDocker = _chunk2VEHSKNAjs.isInDocker; exports.isIntegerProp = _chunk2VEHSKNAjs.isIntegerProp; exports.isJsonProp = _chunk2VEHSKNAjs.isJsonProp; exports.isKnexError = _chunk2VEHSKNAjs.isKnexError; exports.isKyselyError = _chunk2VEHSKNAjs.isKyselyError; exports.isLocal = _chunk2VEHSKNAjs.isLocal; exports.isManyToManyRelationProp = _chunk2VEHSKNAjs.isManyToManyRelationProp; exports.isOneToOneRelationProp = _chunk2VEHSKNAjs.isOneToOneRelationProp; exports.isProduction = _chunk2VEHSKNAjs.isProduction; exports.isRefField = _chunkGHF56FO6js.isRefField; exports.isRelationProp = _chunk2VEHSKNAjs.isRelationProp; exports.isRemote = _chunk2VEHSKNAjs.isRemote; exports.isSoException = _chunk2VEHSKNAjs.isSoException; exports.isStaging = _chunk2VEHSKNAjs.isStaging; exports.isStringProp = _chunk2VEHSKNAjs.isStringProp; exports.isTest = _chunk2VEHSKNAjs.isTest; exports.isTextProp = _chunk2VEHSKNAjs.isTextProp; exports.isTimeProp = _chunk2VEHSKNAjs.isTimeProp; exports.isTimestampProp = _chunk2VEHSKNAjs.isTimestampProp; exports.isUuidProp = _chunk2VEHSKNAjs.isUuidProp; exports.isVirtualProp = _chunk2VEHSKNAjs.isVirtualProp; exports.nonNullable = _chunk2VEHSKNAjs.nonNullable; exports.objToMap = _chunk2VEHSKNAjs.objToMap; exports.p = p; exports.propNodeToZodTypeDef = _chunk2VEHSKNAjs.propNodeToZodTypeDef; exports.propToZodTypeDef = _chunk2VEHSKNAjs.propToZodTypeDef; exports.registeredApis = _chunk2VEHSKNAjs.registeredApis; exports.serializeZodType = _chunk2VEHSKNAjs.serializeZodType; exports.setupErrorHandler = setupErrorHandler; exports.unwrapPromiseOnce = _chunk2VEHSKNAjs.unwrapPromiseOnce; exports.zArrayable = _chunk2VEHSKNAjs.zArrayable; exports.zodTypeToTsTypeDef = _chunk2VEHSKNAjs.zodTypeToTsTypeDef; exports.zodTypeToZodCode = _chunk2VEHSKNAjs.zodTypeToZodCode;
 //# sourceMappingURL=index.js.map

package/dist/index.mjs CHANGED Viewed

@@ -2,11 +2,11 @@ import {
   FixtureManager,
   FixtureManagerClass,
   Migrator
-} from "./chunk-GQVZQZ5J.mjs";
+} from "./chunk-OTL37JQ4.mjs";
 import {
   UpsertBuilder,
   isRefField
-} from "./chunk-IEP5SWTY.mjs";
+} from "./chunk-AK547YMV.mjs";
 import {
   AlreadyProcessedException,
   ApiParamType,
@@ -88,7 +88,7 @@ import {
   zArrayable,
   zodTypeToTsTypeDef,
   zodTypeToZodCode
-} from "./chunk-VBBKB2LD.mjs";
+} from "./chunk-IV7ZWWBN.mjs";
 import "./chunk-PTFDTOJU.mjs";
 // src/exceptions/error-handler.ts

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "sonamu",
-  "version": "0.4.8",
+  "version": "0.4.9",
   "description": "Sonamu — TypeScript Fullstack API Framework",
   "keywords": [
     "typescript",

package/src/entity/entity-manager.ts CHANGED Viewed

@@ -96,7 +96,7 @@ class EntityManagerClass {
   }
   getAllIds(): string[] {
-    return Array.from(EntityManager.entities.keys());
+    return Array.from(EntityManager.entities.keys()).sort();
   }
   getAllParentIds(): string[] {

package/src/templates/generated.template.ts CHANGED Viewed

@@ -72,7 +72,7 @@ export class Template__generated extends Template {
         }
         return {
           lines: [...result!.lines, `// ${ts.label}`, ...ts.lines, ""],
-          importKeys: _.uniq([...result!.importKeys, ...ts.importKeys]),
+          importKeys: _.uniq([...result!.importKeys, ...ts.importKeys].sort()),
         };
       },
       {