typeorm 0.3.18-dev.dff2d53 → 0.3.18-dev.e67d704

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 (378) hide show
  1. package/README.md +23 -23
  2. package/browser/data-source/BaseDataSourceOptions.d.ts +4 -0
  3. package/browser/data-source/BaseDataSourceOptions.js.map +1 -1
  4. package/browser/data-source/DataSource.d.ts +4 -0
  5. package/browser/data-source/DataSource.js +14 -0
  6. package/browser/data-source/DataSource.js.map +1 -1
  7. package/browser/decorator/Index.js +1 -0
  8. package/browser/decorator/Index.js.map +1 -1
  9. package/browser/decorator/options/IndexOptions.d.ts +5 -0
  10. package/browser/decorator/options/IndexOptions.js.map +1 -1
  11. package/browser/driver/Driver.d.ts +4 -0
  12. package/browser/driver/Driver.js.map +1 -1
  13. package/browser/driver/DriverUtils.js +2 -5
  14. package/browser/driver/DriverUtils.js.map +1 -1
  15. package/browser/driver/aurora-mysql/AuroraMysqlQueryRunner.js +9 -6
  16. package/browser/driver/aurora-mysql/AuroraMysqlQueryRunner.js.map +1 -1
  17. package/browser/driver/aurora-postgres/AuroraPostgresQueryRunner.js +9 -6
  18. package/browser/driver/aurora-postgres/AuroraPostgresQueryRunner.js.map +1 -1
  19. package/browser/driver/cockroachdb/CockroachConnectionOptions.d.ts +6 -0
  20. package/browser/driver/cockroachdb/CockroachConnectionOptions.js.map +1 -1
  21. package/browser/driver/cockroachdb/CockroachDriver.d.ts +4 -0
  22. package/browser/driver/cockroachdb/CockroachDriver.js +10 -1
  23. package/browser/driver/cockroachdb/CockroachDriver.js.map +1 -1
  24. package/browser/driver/cockroachdb/CockroachQueryRunner.d.ts +6 -1
  25. package/browser/driver/cockroachdb/CockroachQueryRunner.js +46 -17
  26. package/browser/driver/cockroachdb/CockroachQueryRunner.js.map +1 -1
  27. package/browser/driver/cordova/CordovaQueryRunner.js +8 -0
  28. package/browser/driver/cordova/CordovaQueryRunner.js.map +1 -1
  29. package/browser/driver/expo/ExpoQueryRunner.js +9 -2
  30. package/browser/driver/expo/ExpoQueryRunner.js.map +1 -1
  31. package/browser/driver/mongodb/MongoQueryRunner.d.ts +3 -3
  32. package/browser/driver/mongodb/MongoQueryRunner.js.map +1 -1
  33. package/browser/driver/mongodb/typings.d.ts +3 -3
  34. package/browser/driver/mongodb/typings.js.map +1 -1
  35. package/browser/driver/mysql/MysqlConnectionOptions.d.ts +6 -0
  36. package/browser/driver/mysql/MysqlConnectionOptions.js.map +1 -1
  37. package/browser/driver/mysql/MysqlQueryRunner.js +18 -7
  38. package/browser/driver/mysql/MysqlQueryRunner.js.map +1 -1
  39. package/browser/driver/oracle/OracleConnectionOptions.d.ts +14 -0
  40. package/browser/driver/oracle/OracleConnectionOptions.js.map +1 -1
  41. package/browser/driver/oracle/OracleDriver.d.ts +4 -0
  42. package/browser/driver/oracle/OracleDriver.js +17 -2
  43. package/browser/driver/oracle/OracleDriver.js.map +1 -1
  44. package/browser/driver/oracle/OracleQueryRunner.js +48 -6
  45. package/browser/driver/oracle/OracleQueryRunner.js.map +1 -1
  46. package/browser/driver/postgres/PostgresConnectionCredentialsOptions.d.ts +5 -0
  47. package/browser/driver/postgres/PostgresConnectionCredentialsOptions.js.map +1 -1
  48. package/browser/driver/postgres/PostgresConnectionOptions.d.ts +6 -5
  49. package/browser/driver/postgres/PostgresConnectionOptions.js.map +1 -1
  50. package/browser/driver/postgres/PostgresDriver.d.ts +4 -0
  51. package/browser/driver/postgres/PostgresDriver.js +13 -4
  52. package/browser/driver/postgres/PostgresDriver.js.map +1 -1
  53. package/browser/driver/postgres/PostgresQueryRunner.js +46 -23
  54. package/browser/driver/postgres/PostgresQueryRunner.js.map +1 -1
  55. package/browser/driver/react-native/ReactNativeQueryRunner.js +10 -2
  56. package/browser/driver/react-native/ReactNativeQueryRunner.js.map +1 -1
  57. package/browser/driver/sap/SapDriver.d.ts +8 -0
  58. package/browser/driver/sap/SapDriver.js +14 -3
  59. package/browser/driver/sap/SapDriver.js.map +1 -1
  60. package/browser/driver/sap/SapQueryRunner.d.ts +5 -14
  61. package/browser/driver/sap/SapQueryRunner.js +74 -64
  62. package/browser/driver/sap/SapQueryRunner.js.map +1 -1
  63. package/browser/driver/spanner/SpannerConnectionOptions.d.ts +6 -0
  64. package/browser/driver/spanner/SpannerConnectionOptions.js.map +1 -1
  65. package/browser/driver/spanner/SpannerDriver.d.ts +4 -0
  66. package/browser/driver/spanner/SpannerDriver.js +10 -1
  67. package/browser/driver/spanner/SpannerDriver.js.map +1 -1
  68. package/browser/driver/spanner/SpannerQueryRunner.js +6 -0
  69. package/browser/driver/spanner/SpannerQueryRunner.js.map +1 -1
  70. package/browser/driver/sqlite/SqliteDriver.js.map +1 -1
  71. package/browser/driver/sqlite/SqliteQueryRunner.js +61 -46
  72. package/browser/driver/sqlite/SqliteQueryRunner.js.map +1 -1
  73. package/browser/driver/sqlite-abstract/AbstractSqliteQueryRunner.js +10 -16
  74. package/browser/driver/sqlite-abstract/AbstractSqliteQueryRunner.js.map +1 -1
  75. package/browser/driver/sqljs/SqljsQueryRunner.js +11 -3
  76. package/browser/driver/sqljs/SqljsQueryRunner.js.map +1 -1
  77. package/browser/driver/sqlserver/SqlServerConnectionCredentialsOptions.d.ts +2 -1
  78. package/browser/driver/sqlserver/SqlServerConnectionCredentialsOptions.js.map +1 -1
  79. package/browser/driver/sqlserver/SqlServerConnectionOptions.d.ts +11 -5
  80. package/browser/driver/sqlserver/SqlServerConnectionOptions.js.map +1 -1
  81. package/browser/driver/sqlserver/SqlServerDriver.d.ts +4 -0
  82. package/browser/driver/sqlserver/SqlServerDriver.js +10 -1
  83. package/browser/driver/sqlserver/SqlServerDriver.js.map +1 -1
  84. package/browser/driver/sqlserver/SqlServerQueryRunner.js +25 -5
  85. package/browser/driver/sqlserver/SqlServerQueryRunner.js.map +1 -1
  86. package/browser/driver/sqlserver/authentication/AzureActiveDirectoryDefaultAuthentication.d.ts +12 -0
  87. package/browser/driver/sqlserver/authentication/AzureActiveDirectoryDefaultAuthentication.js +3 -0
  88. package/browser/driver/sqlserver/authentication/AzureActiveDirectoryDefaultAuthentication.js.map +1 -0
  89. package/browser/entity-manager/EntityManager.d.ts +5 -1
  90. package/browser/entity-manager/EntityManager.js +15 -2
  91. package/browser/entity-manager/EntityManager.js.map +1 -1
  92. package/browser/entity-manager/MongoEntityManager.d.ts +8 -4
  93. package/browser/entity-manager/MongoEntityManager.js +12 -10
  94. package/browser/entity-manager/MongoEntityManager.js.map +1 -1
  95. package/browser/entity-schema/EntitySchemaOptions.d.ts +4 -0
  96. package/browser/entity-schema/EntitySchemaOptions.js.map +1 -1
  97. package/browser/entity-schema/EntitySchemaTransformer.js +7 -0
  98. package/browser/entity-schema/EntitySchemaTransformer.js.map +1 -1
  99. package/browser/error/EntityNotFoundError.d.ts +2 -0
  100. package/browser/error/EntityNotFoundError.js +2 -0
  101. package/browser/error/EntityNotFoundError.js.map +1 -1
  102. package/browser/error/QueryFailedError.d.ts +3 -3
  103. package/browser/error/QueryFailedError.js.map +1 -1
  104. package/browser/find-options/FindOptionsUtils.js +1 -1
  105. package/browser/find-options/FindOptionsUtils.js.map +1 -1
  106. package/browser/find-options/FindOptionsWhere.d.ts +1 -1
  107. package/browser/find-options/FindOptionsWhere.js.map +1 -1
  108. package/browser/index.d.ts +1 -0
  109. package/browser/index.js +1 -0
  110. package/browser/index.js.map +1 -1
  111. package/browser/logger/AbstractLogger.js +1 -1
  112. package/browser/logger/AbstractLogger.js.map +1 -1
  113. package/browser/metadata/ColumnMetadata.js +4 -0
  114. package/browser/metadata/ColumnMetadata.js.map +1 -1
  115. package/browser/metadata/EntityMetadata.d.ts +3 -3
  116. package/browser/metadata/EntityMetadata.js +7 -3
  117. package/browser/metadata/EntityMetadata.js.map +1 -1
  118. package/browser/metadata/IndexMetadata.d.ts +5 -0
  119. package/browser/metadata/IndexMetadata.js +1 -0
  120. package/browser/metadata/IndexMetadata.js.map +1 -1
  121. package/browser/metadata-args/IndexMetadataArgs.d.ts +5 -0
  122. package/browser/metadata-args/IndexMetadataArgs.js.map +1 -1
  123. package/browser/metadata-builder/EntityMetadataBuilder.js +22 -0
  124. package/browser/metadata-builder/EntityMetadataBuilder.js.map +1 -1
  125. package/browser/naming-strategy/DefaultNamingStrategy.d.ts +0 -1
  126. package/browser/naming-strategy/DefaultNamingStrategy.js +0 -3
  127. package/browser/naming-strategy/DefaultNamingStrategy.js.map +1 -1
  128. package/browser/naming-strategy/NamingStrategyInterface.d.ts +0 -4
  129. package/browser/naming-strategy/NamingStrategyInterface.js.map +1 -1
  130. package/browser/persistence/Subject.js +2 -1
  131. package/browser/persistence/Subject.js.map +1 -1
  132. package/browser/persistence/SubjectExecutor.js +4 -1
  133. package/browser/persistence/SubjectExecutor.js.map +1 -1
  134. package/browser/persistence/subject-builder/ManyToManySubjectBuilder.js +6 -2
  135. package/browser/persistence/subject-builder/ManyToManySubjectBuilder.js.map +1 -1
  136. package/browser/platform/BrowserPlatformTools.js +3 -2
  137. package/browser/platform/BrowserPlatformTools.js.map +1 -1
  138. package/browser/platform/PlatformTools.js +2 -0
  139. package/browser/platform/PlatformTools.js.map +1 -1
  140. package/browser/query-builder/InsertQueryBuilder.js +19 -6
  141. package/browser/query-builder/InsertQueryBuilder.js.map +1 -1
  142. package/browser/query-builder/QueryBuilder.d.ts +5 -0
  143. package/browser/query-builder/QueryBuilder.js +27 -24
  144. package/browser/query-builder/QueryBuilder.js.map +1 -1
  145. package/browser/query-builder/SelectQueryBuilder.js +13 -3
  146. package/browser/query-builder/SelectQueryBuilder.js.map +1 -1
  147. package/browser/query-builder/index.d.ts +1 -0
  148. package/browser/query-builder/index.js +17 -0
  149. package/browser/query-builder/index.js.map +1 -0
  150. package/browser/query-builder/transformer/RawSqlResultsToEntityTransformer.d.ts +9 -0
  151. package/browser/query-builder/transformer/RawSqlResultsToEntityTransformer.js +28 -0
  152. package/browser/query-builder/transformer/RawSqlResultsToEntityTransformer.js.map +1 -1
  153. package/browser/repository/BaseEntity.d.ts +12 -0
  154. package/browser/repository/BaseEntity.js +12 -0
  155. package/browser/repository/BaseEntity.js.map +1 -1
  156. package/browser/repository/MongoRepository.d.ts +8 -4
  157. package/browser/repository/MongoRepository.js +6 -0
  158. package/browser/repository/MongoRepository.js.map +1 -1
  159. package/browser/repository/Repository.d.ts +14 -2
  160. package/browser/repository/Repository.js +26 -6
  161. package/browser/repository/Repository.js.map +1 -1
  162. package/browser/schema-builder/options/TableIndexOptions.d.ts +5 -0
  163. package/browser/schema-builder/options/TableIndexOptions.js.map +1 -1
  164. package/browser/schema-builder/table/TableIndex.d.ts +5 -0
  165. package/browser/schema-builder/table/TableIndex.js +3 -0
  166. package/browser/schema-builder/table/TableIndex.js.map +1 -1
  167. package/browser/subscriber/Broadcaster.d.ts +11 -1
  168. package/browser/subscriber/Broadcaster.js +48 -1
  169. package/browser/subscriber/Broadcaster.js.map +1 -1
  170. package/browser/subscriber/EntitySubscriberInterface.d.ts +9 -0
  171. package/browser/subscriber/EntitySubscriberInterface.js.map +1 -1
  172. package/browser/subscriber/event/InsertEvent.d.ts +5 -0
  173. package/browser/subscriber/event/InsertEvent.js.map +1 -1
  174. package/browser/subscriber/event/QueryEvent.d.ts +50 -0
  175. package/browser/subscriber/event/QueryEvent.js +3 -0
  176. package/browser/subscriber/event/QueryEvent.js.map +1 -0
  177. package/browser/util/DateUtils.js +4 -2
  178. package/browser/util/DateUtils.js.map +1 -1
  179. package/browser/util/OrmUtils.d.ts +6 -0
  180. package/browser/util/OrmUtils.js +66 -0
  181. package/browser/util/OrmUtils.js.map +1 -1
  182. package/commands/CommandUtils.js +6 -1
  183. package/commands/CommandUtils.js.map +1 -1
  184. package/commands/EntityCreateCommand.d.ts +3 -0
  185. package/commands/EntityCreateCommand.js +7 -0
  186. package/commands/EntityCreateCommand.js.map +1 -1
  187. package/commands/InitCommand.js +1 -1
  188. package/commands/InitCommand.js.map +1 -1
  189. package/commands/MigrationCreateCommand.d.ts +5 -1
  190. package/commands/MigrationCreateCommand.js +6 -1
  191. package/commands/MigrationCreateCommand.js.map +1 -1
  192. package/commands/MigrationGenerateCommand.d.ts +5 -1
  193. package/commands/MigrationGenerateCommand.js +8 -1
  194. package/commands/MigrationGenerateCommand.js.map +1 -1
  195. package/commands/SubscriberCreateCommand.d.ts +3 -0
  196. package/commands/SubscriberCreateCommand.js +7 -0
  197. package/commands/SubscriberCreateCommand.js.map +1 -1
  198. package/data-source/BaseDataSourceOptions.d.ts +4 -0
  199. package/data-source/BaseDataSourceOptions.js.map +1 -1
  200. package/data-source/DataSource.d.ts +4 -0
  201. package/data-source/DataSource.js +14 -0
  202. package/data-source/DataSource.js.map +1 -1
  203. package/decorator/Index.js +1 -0
  204. package/decorator/Index.js.map +1 -1
  205. package/decorator/options/IndexOptions.d.ts +5 -0
  206. package/decorator/options/IndexOptions.js.map +1 -1
  207. package/driver/Driver.d.ts +4 -0
  208. package/driver/Driver.js.map +1 -1
  209. package/driver/DriverUtils.js +2 -5
  210. package/driver/DriverUtils.js.map +1 -1
  211. package/driver/aurora-mysql/AuroraMysqlQueryRunner.js +9 -6
  212. package/driver/aurora-mysql/AuroraMysqlQueryRunner.js.map +1 -1
  213. package/driver/aurora-postgres/AuroraPostgresQueryRunner.js +9 -6
  214. package/driver/aurora-postgres/AuroraPostgresQueryRunner.js.map +1 -1
  215. package/driver/cockroachdb/CockroachConnectionOptions.d.ts +6 -0
  216. package/driver/cockroachdb/CockroachConnectionOptions.js.map +1 -1
  217. package/driver/cockroachdb/CockroachDriver.d.ts +4 -0
  218. package/driver/cockroachdb/CockroachDriver.js +10 -1
  219. package/driver/cockroachdb/CockroachDriver.js.map +1 -1
  220. package/driver/cockroachdb/CockroachQueryRunner.d.ts +6 -1
  221. package/driver/cockroachdb/CockroachQueryRunner.js +46 -17
  222. package/driver/cockroachdb/CockroachQueryRunner.js.map +1 -1
  223. package/driver/cordova/CordovaQueryRunner.js +8 -0
  224. package/driver/cordova/CordovaQueryRunner.js.map +1 -1
  225. package/driver/expo/ExpoQueryRunner.js +9 -2
  226. package/driver/expo/ExpoQueryRunner.js.map +1 -1
  227. package/driver/mongodb/MongoQueryRunner.d.ts +3 -3
  228. package/driver/mongodb/MongoQueryRunner.js.map +1 -1
  229. package/driver/mongodb/typings.d.ts +3 -3
  230. package/driver/mongodb/typings.js.map +1 -1
  231. package/driver/mysql/MysqlConnectionOptions.d.ts +6 -0
  232. package/driver/mysql/MysqlConnectionOptions.js.map +1 -1
  233. package/driver/mysql/MysqlQueryRunner.js +18 -7
  234. package/driver/mysql/MysqlQueryRunner.js.map +1 -1
  235. package/driver/oracle/OracleConnectionOptions.d.ts +14 -0
  236. package/driver/oracle/OracleConnectionOptions.js.map +1 -1
  237. package/driver/oracle/OracleDriver.d.ts +4 -0
  238. package/driver/oracle/OracleDriver.js +17 -2
  239. package/driver/oracle/OracleDriver.js.map +1 -1
  240. package/driver/oracle/OracleQueryRunner.js +48 -6
  241. package/driver/oracle/OracleQueryRunner.js.map +1 -1
  242. package/driver/postgres/PostgresConnectionCredentialsOptions.d.ts +5 -0
  243. package/driver/postgres/PostgresConnectionCredentialsOptions.js.map +1 -1
  244. package/driver/postgres/PostgresConnectionOptions.d.ts +6 -5
  245. package/driver/postgres/PostgresConnectionOptions.js.map +1 -1
  246. package/driver/postgres/PostgresDriver.d.ts +4 -0
  247. package/driver/postgres/PostgresDriver.js +13 -4
  248. package/driver/postgres/PostgresDriver.js.map +1 -1
  249. package/driver/postgres/PostgresQueryRunner.js +46 -23
  250. package/driver/postgres/PostgresQueryRunner.js.map +1 -1
  251. package/driver/react-native/ReactNativeQueryRunner.js +10 -2
  252. package/driver/react-native/ReactNativeQueryRunner.js.map +1 -1
  253. package/driver/sap/SapDriver.d.ts +8 -0
  254. package/driver/sap/SapDriver.js +15 -4
  255. package/driver/sap/SapDriver.js.map +1 -1
  256. package/driver/sap/SapQueryRunner.d.ts +5 -14
  257. package/driver/sap/SapQueryRunner.js +74 -64
  258. package/driver/sap/SapQueryRunner.js.map +1 -1
  259. package/driver/spanner/SpannerConnectionOptions.d.ts +6 -0
  260. package/driver/spanner/SpannerConnectionOptions.js.map +1 -1
  261. package/driver/spanner/SpannerDriver.d.ts +4 -0
  262. package/driver/spanner/SpannerDriver.js +10 -1
  263. package/driver/spanner/SpannerDriver.js.map +1 -1
  264. package/driver/spanner/SpannerQueryRunner.js +6 -0
  265. package/driver/spanner/SpannerQueryRunner.js.map +1 -1
  266. package/driver/sqlite/SqliteDriver.js.map +1 -1
  267. package/driver/sqlite/SqliteQueryRunner.js +61 -46
  268. package/driver/sqlite/SqliteQueryRunner.js.map +1 -1
  269. package/driver/sqlite-abstract/AbstractSqliteQueryRunner.js +10 -16
  270. package/driver/sqlite-abstract/AbstractSqliteQueryRunner.js.map +1 -1
  271. package/driver/sqljs/SqljsQueryRunner.js +11 -3
  272. package/driver/sqljs/SqljsQueryRunner.js.map +1 -1
  273. package/driver/sqlserver/SqlServerConnectionCredentialsOptions.d.ts +2 -1
  274. package/driver/sqlserver/SqlServerConnectionCredentialsOptions.js.map +1 -1
  275. package/driver/sqlserver/SqlServerConnectionOptions.d.ts +11 -5
  276. package/driver/sqlserver/SqlServerConnectionOptions.js.map +1 -1
  277. package/driver/sqlserver/SqlServerDriver.d.ts +4 -0
  278. package/driver/sqlserver/SqlServerDriver.js +10 -1
  279. package/driver/sqlserver/SqlServerDriver.js.map +1 -1
  280. package/driver/sqlserver/SqlServerQueryRunner.js +25 -5
  281. package/driver/sqlserver/SqlServerQueryRunner.js.map +1 -1
  282. package/driver/sqlserver/authentication/AzureActiveDirectoryDefaultAuthentication.d.ts +12 -0
  283. package/driver/sqlserver/authentication/AzureActiveDirectoryDefaultAuthentication.js +4 -0
  284. package/driver/sqlserver/authentication/AzureActiveDirectoryDefaultAuthentication.js.map +1 -0
  285. package/entity-manager/EntityManager.d.ts +5 -1
  286. package/entity-manager/EntityManager.js +15 -2
  287. package/entity-manager/EntityManager.js.map +1 -1
  288. package/entity-manager/MongoEntityManager.d.ts +8 -4
  289. package/entity-manager/MongoEntityManager.js +12 -10
  290. package/entity-manager/MongoEntityManager.js.map +1 -1
  291. package/entity-schema/EntitySchemaOptions.d.ts +4 -0
  292. package/entity-schema/EntitySchemaOptions.js.map +1 -1
  293. package/entity-schema/EntitySchemaTransformer.js +7 -0
  294. package/entity-schema/EntitySchemaTransformer.js.map +1 -1
  295. package/error/EntityNotFoundError.d.ts +2 -0
  296. package/error/EntityNotFoundError.js +2 -0
  297. package/error/EntityNotFoundError.js.map +1 -1
  298. package/error/QueryFailedError.d.ts +3 -3
  299. package/error/QueryFailedError.js.map +1 -1
  300. package/find-options/FindOptionsUtils.js +1 -1
  301. package/find-options/FindOptionsUtils.js.map +1 -1
  302. package/find-options/FindOptionsWhere.d.ts +1 -1
  303. package/find-options/FindOptionsWhere.js.map +1 -1
  304. package/index.d.ts +1 -0
  305. package/index.js +1 -0
  306. package/index.js.map +1 -1
  307. package/index.mjs +2 -0
  308. package/logger/AbstractLogger.js +1 -1
  309. package/logger/AbstractLogger.js.map +1 -1
  310. package/metadata/ColumnMetadata.js +4 -0
  311. package/metadata/ColumnMetadata.js.map +1 -1
  312. package/metadata/EntityMetadata.d.ts +3 -3
  313. package/metadata/EntityMetadata.js +7 -3
  314. package/metadata/EntityMetadata.js.map +1 -1
  315. package/metadata/IndexMetadata.d.ts +5 -0
  316. package/metadata/IndexMetadata.js +1 -0
  317. package/metadata/IndexMetadata.js.map +1 -1
  318. package/metadata-args/IndexMetadataArgs.d.ts +5 -0
  319. package/metadata-args/IndexMetadataArgs.js.map +1 -1
  320. package/metadata-builder/EntityMetadataBuilder.js +22 -0
  321. package/metadata-builder/EntityMetadataBuilder.js.map +1 -1
  322. package/naming-strategy/DefaultNamingStrategy.d.ts +0 -1
  323. package/naming-strategy/DefaultNamingStrategy.js +0 -3
  324. package/naming-strategy/DefaultNamingStrategy.js.map +1 -1
  325. package/naming-strategy/NamingStrategyInterface.d.ts +0 -4
  326. package/naming-strategy/NamingStrategyInterface.js.map +1 -1
  327. package/package.json +1 -1
  328. package/persistence/Subject.js +2 -1
  329. package/persistence/Subject.js.map +1 -1
  330. package/persistence/SubjectExecutor.js +4 -1
  331. package/persistence/SubjectExecutor.js.map +1 -1
  332. package/persistence/subject-builder/ManyToManySubjectBuilder.js +6 -2
  333. package/persistence/subject-builder/ManyToManySubjectBuilder.js.map +1 -1
  334. package/platform/PlatformTools.js +2 -0
  335. package/platform/PlatformTools.js.map +1 -1
  336. package/query-builder/InsertQueryBuilder.js +19 -6
  337. package/query-builder/InsertQueryBuilder.js.map +1 -1
  338. package/query-builder/QueryBuilder.d.ts +5 -0
  339. package/query-builder/QueryBuilder.js +27 -24
  340. package/query-builder/QueryBuilder.js.map +1 -1
  341. package/query-builder/SelectQueryBuilder.js +13 -3
  342. package/query-builder/SelectQueryBuilder.js.map +1 -1
  343. package/query-builder/index.d.ts +1 -0
  344. package/query-builder/index.js +21 -0
  345. package/query-builder/index.js.map +1 -0
  346. package/query-builder/transformer/RawSqlResultsToEntityTransformer.d.ts +9 -0
  347. package/query-builder/transformer/RawSqlResultsToEntityTransformer.js +28 -0
  348. package/query-builder/transformer/RawSqlResultsToEntityTransformer.js.map +1 -1
  349. package/repository/BaseEntity.d.ts +12 -0
  350. package/repository/BaseEntity.js +12 -0
  351. package/repository/BaseEntity.js.map +1 -1
  352. package/repository/MongoRepository.d.ts +8 -4
  353. package/repository/MongoRepository.js +6 -0
  354. package/repository/MongoRepository.js.map +1 -1
  355. package/repository/Repository.d.ts +14 -2
  356. package/repository/Repository.js +26 -6
  357. package/repository/Repository.js.map +1 -1
  358. package/schema-builder/options/TableIndexOptions.d.ts +5 -0
  359. package/schema-builder/options/TableIndexOptions.js.map +1 -1
  360. package/schema-builder/table/TableIndex.d.ts +5 -0
  361. package/schema-builder/table/TableIndex.js +3 -0
  362. package/schema-builder/table/TableIndex.js.map +1 -1
  363. package/subscriber/Broadcaster.d.ts +11 -1
  364. package/subscriber/Broadcaster.js +48 -1
  365. package/subscriber/Broadcaster.js.map +1 -1
  366. package/subscriber/EntitySubscriberInterface.d.ts +9 -0
  367. package/subscriber/EntitySubscriberInterface.js.map +1 -1
  368. package/subscriber/event/InsertEvent.d.ts +5 -0
  369. package/subscriber/event/InsertEvent.js.map +1 -1
  370. package/subscriber/event/QueryEvent.d.ts +50 -0
  371. package/subscriber/event/QueryEvent.js +4 -0
  372. package/subscriber/event/QueryEvent.js.map +1 -0
  373. package/typeorm-model-shim.js +61 -53
  374. package/util/DateUtils.js +5 -2
  375. package/util/DateUtils.js.map +1 -1
  376. package/util/OrmUtils.d.ts +6 -0
  377. package/util/OrmUtils.js +66 -0
  378. package/util/OrmUtils.js.map +1 -1
@@ -90,11 +90,8 @@ export class DriverUtils {
90
90
  * @return An alias that is no longer than the divers max alias length.
91
91
  */
92
92
  static buildAlias({ maxAliasLength }, buildOptions, ...alias) {
93
- const newAlias = alias.length === 1
94
- ? alias[0]
95
- : alias.join(buildOptions && buildOptions.joiner
96
- ? buildOptions.joiner
97
- : "_");
93
+ const joiner = buildOptions && buildOptions.joiner ? buildOptions.joiner : "_";
94
+ let newAlias = alias.length === 1 ? alias[0] : alias.join(joiner);
98
95
  if (maxAliasLength &&
99
96
  maxAliasLength > 0 &&
100
97
  newAlias.length > maxAliasLength) {
@@ -1 +1 @@
1
- {"version":3,"sources":["../browser/src/driver/DriverUtils.ts"],"names":[],"mappings":"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","file":"DriverUtils.js","sourcesContent":["import { Driver } from \"./Driver\"\nimport { hash, shorten } from \"../util/StringUtils\"\nimport { VersionUtils } from \"../util/VersionUtils\"\n\n/**\n * Common driver utility functions.\n */\nexport class DriverUtils {\n // -------------------------------------------------------------------------\n // Public Static Methods\n // -------------------------------------------------------------------------\n\n /**\n * Returns true if given driver is SQLite-based driver.\n */\n static isSQLiteFamily(driver: Driver): boolean {\n return [\n \"sqlite\",\n \"cordova\",\n \"react-native\",\n \"nativescript\",\n \"sqljs\",\n \"expo\",\n \"better-sqlite3\",\n \"capacitor\",\n ].includes(driver.options.type)\n }\n\n /**\n * Returns true if given driver is MySQL-based driver.\n */\n static isMySQLFamily(driver: Driver): boolean {\n return [\"mysql\", \"mariadb\"].includes(driver.options.type)\n }\n\n static isReleaseVersionOrGreater(driver: Driver, version: string): boolean {\n return (\n driver.version != null &&\n VersionUtils.isGreaterOrEqual(driver.version, version)\n )\n }\n\n static isPostgresFamily(driver: Driver): boolean {\n return [\"postgres\", \"aurora-postgres\", \"cockroachdb\"].includes(\n driver.options.type,\n )\n }\n\n /**\n * Normalizes and builds a new driver options.\n * Extracts settings from connection url and sets to a new options object.\n */\n static buildDriverOptions(\n options: any,\n buildOptions?: { useSid: boolean },\n ): any {\n if (options.url) {\n const urlDriverOptions = this.parseConnectionUrl(options.url) as {\n [key: string]: any\n }\n\n if (\n buildOptions &&\n buildOptions.useSid &&\n urlDriverOptions.database\n ) {\n urlDriverOptions.sid = urlDriverOptions.database\n }\n\n for (const key of Object.keys(urlDriverOptions)) {\n if (typeof urlDriverOptions[key] === \"undefined\") {\n delete urlDriverOptions[key]\n }\n }\n\n return Object.assign({}, options, urlDriverOptions)\n }\n return Object.assign({}, options)\n }\n\n /**\n * buildDriverOptions for MongodDB only to support replica set\n */\n static buildMongoDBDriverOptions(\n options: any,\n buildOptions?: { useSid: boolean },\n ): any {\n if (options.url) {\n const urlDriverOptions = this.parseMongoDBConnectionUrl(\n options.url,\n ) as { [key: string]: any }\n\n if (\n buildOptions &&\n buildOptions.useSid &&\n urlDriverOptions.database\n ) {\n urlDriverOptions.sid = urlDriverOptions.database\n }\n\n for (const key of Object.keys(urlDriverOptions)) {\n if (typeof urlDriverOptions[key] === \"undefined\") {\n delete urlDriverOptions[key]\n }\n }\n\n return Object.assign({}, options, urlDriverOptions)\n }\n return Object.assign({}, options)\n }\n\n /**\n * Joins and shortens alias if needed.\n *\n * If the alias length is greater than the limit allowed by the current\n * driver, replaces it with a shortend string, if the shortend string\n * is still too long, it will then hash the alias.\n *\n * @param driver Current `Driver`.\n * @param buildOptions Optional settings.\n * @param alias Alias parts.\n *\n * @return An alias that is no longer than the divers max alias length.\n */\n static buildAlias(\n { maxAliasLength }: Driver,\n buildOptions: { shorten?: boolean; joiner?: string } | undefined,\n ...alias: string[]\n ): string {\n const newAlias =\n alias.length === 1\n ? alias[0]\n : alias.join(\n buildOptions && buildOptions.joiner\n ? buildOptions.joiner\n : \"_\",\n )\n if (\n maxAliasLength &&\n maxAliasLength > 0 &&\n newAlias.length > maxAliasLength\n ) {\n if (buildOptions && buildOptions.shorten === true) {\n const shortenedAlias = shorten(newAlias)\n if (shortenedAlias.length < maxAliasLength) {\n return shortenedAlias\n }\n }\n\n return hash(newAlias, { length: maxAliasLength })\n }\n\n return newAlias\n }\n\n /**\n * @deprecated use `buildAlias` instead.\n */\n static buildColumnAlias(\n { maxAliasLength }: Driver,\n buildOptions: { shorten?: boolean; joiner?: string } | string,\n ...alias: string[]\n ) {\n if (typeof buildOptions === \"string\") {\n alias.unshift(buildOptions)\n buildOptions = { shorten: false, joiner: \"_\" }\n } else {\n buildOptions = Object.assign(\n { shorten: false, joiner: \"_\" },\n buildOptions,\n )\n }\n return this.buildAlias(\n { maxAliasLength } as Driver,\n buildOptions,\n ...alias,\n )\n }\n\n // -------------------------------------------------------------------------\n // Private Static Methods\n // -------------------------------------------------------------------------\n\n /**\n * Extracts connection data from the connection url.\n */\n private static parseConnectionUrl(url: string) {\n const type = url.split(\":\")[0]\n const firstSlashes = url.indexOf(\"//\")\n const preBase = url.substr(firstSlashes + 2)\n const secondSlash = preBase.indexOf(\"/\")\n const base =\n secondSlash !== -1 ? preBase.substr(0, secondSlash) : preBase\n let afterBase =\n secondSlash !== -1 ? preBase.substr(secondSlash + 1) : undefined\n // remove mongodb query params\n if (afterBase && afterBase.indexOf(\"?\") !== -1) {\n afterBase = afterBase.substr(0, afterBase.indexOf(\"?\"))\n }\n\n const lastAtSign = base.lastIndexOf(\"@\")\n const usernameAndPassword = base.substr(0, lastAtSign)\n const hostAndPort = base.substr(lastAtSign + 1)\n\n let username = usernameAndPassword\n let password = \"\"\n const firstColon = usernameAndPassword.indexOf(\":\")\n if (firstColon !== -1) {\n username = usernameAndPassword.substr(0, firstColon)\n password = usernameAndPassword.substr(firstColon + 1)\n }\n const [host, port] = hostAndPort.split(\":\")\n\n return {\n type: type,\n host: host,\n username: decodeURIComponent(username),\n password: decodeURIComponent(password),\n port: port ? parseInt(port) : undefined,\n database: afterBase || undefined,\n }\n }\n\n /**\n * Extracts connection data from the connection url for MongoDB to support replica set.\n */\n private static parseMongoDBConnectionUrl(url: string) {\n const type = url.split(\":\")[0]\n const firstSlashes = url.indexOf(\"//\")\n const preBase = url.substr(firstSlashes + 2)\n const secondSlash = preBase.indexOf(\"/\")\n const base =\n secondSlash !== -1 ? preBase.substr(0, secondSlash) : preBase\n let afterBase =\n secondSlash !== -1 ? preBase.substr(secondSlash + 1) : undefined\n let afterQuestionMark = \"\"\n let host = undefined\n let port = undefined\n let hostReplicaSet = undefined\n let replicaSet = undefined\n\n let optionsObject: any = {}\n\n if (afterBase && afterBase.indexOf(\"?\") !== -1) {\n // split params\n afterQuestionMark = afterBase.substr(\n afterBase.indexOf(\"?\") + 1,\n afterBase.length,\n )\n\n const optionsList = afterQuestionMark.split(\"&\")\n let optionKey: string\n let optionValue: string\n\n // create optionsObject for merge with connectionUrl object before return\n optionsList.forEach((optionItem) => {\n optionKey = optionItem.split(\"=\")[0]\n optionValue = optionItem.split(\"=\")[1]\n optionsObject[optionKey] = optionValue\n })\n\n // specific replicaSet value to set options about hostReplicaSet\n replicaSet = optionsObject[\"replicaSet\"]\n afterBase = afterBase.substr(0, afterBase.indexOf(\"?\"))\n }\n\n const lastAtSign = base.lastIndexOf(\"@\")\n const usernameAndPassword = base.substr(0, lastAtSign)\n const hostAndPort = base.substr(lastAtSign + 1)\n\n let username = usernameAndPassword\n let password = \"\"\n const firstColon = usernameAndPassword.indexOf(\":\")\n if (firstColon !== -1) {\n username = usernameAndPassword.substr(0, firstColon)\n password = usernameAndPassword.substr(firstColon + 1)\n }\n\n // If replicaSet have value set It as hostlist, If not set like standalone host\n if (replicaSet) {\n hostReplicaSet = hostAndPort\n } else {\n ;[host, port] = hostAndPort.split(\":\")\n }\n\n let connectionUrl: any = {\n type: type,\n host: host,\n hostReplicaSet: hostReplicaSet,\n username: decodeURIComponent(username),\n password: decodeURIComponent(password),\n port: port ? parseInt(port) : undefined,\n database: afterBase || undefined,\n }\n\n // Loop to set every options in connectionUrl to object\n for (const [key, value] of Object.entries(optionsObject)) {\n connectionUrl[key] = value\n }\n\n return connectionUrl\n }\n}\n"],"sourceRoot":".."}
1
+ {"version":3,"sources":["../browser/src/driver/DriverUtils.ts"],"names":[],"mappings":"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","file":"DriverUtils.js","sourcesContent":["import { Driver } from \"./Driver\"\nimport { hash, shorten } from \"../util/StringUtils\"\nimport { VersionUtils } from \"../util/VersionUtils\"\n\n/**\n * Common driver utility functions.\n */\nexport class DriverUtils {\n // -------------------------------------------------------------------------\n // Public Static Methods\n // -------------------------------------------------------------------------\n\n /**\n * Returns true if given driver is SQLite-based driver.\n */\n static isSQLiteFamily(driver: Driver): boolean {\n return [\n \"sqlite\",\n \"cordova\",\n \"react-native\",\n \"nativescript\",\n \"sqljs\",\n \"expo\",\n \"better-sqlite3\",\n \"capacitor\",\n ].includes(driver.options.type)\n }\n\n /**\n * Returns true if given driver is MySQL-based driver.\n */\n static isMySQLFamily(driver: Driver): boolean {\n return [\"mysql\", \"mariadb\"].includes(driver.options.type)\n }\n\n static isReleaseVersionOrGreater(driver: Driver, version: string): boolean {\n return (\n driver.version != null &&\n VersionUtils.isGreaterOrEqual(driver.version, version)\n )\n }\n\n static isPostgresFamily(driver: Driver): boolean {\n return [\"postgres\", \"aurora-postgres\", \"cockroachdb\"].includes(\n driver.options.type,\n )\n }\n\n /**\n * Normalizes and builds a new driver options.\n * Extracts settings from connection url and sets to a new options object.\n */\n static buildDriverOptions(\n options: any,\n buildOptions?: { useSid: boolean },\n ): any {\n if (options.url) {\n const urlDriverOptions = this.parseConnectionUrl(options.url) as {\n [key: string]: any\n }\n\n if (\n buildOptions &&\n buildOptions.useSid &&\n urlDriverOptions.database\n ) {\n urlDriverOptions.sid = urlDriverOptions.database\n }\n\n for (const key of Object.keys(urlDriverOptions)) {\n if (typeof urlDriverOptions[key] === \"undefined\") {\n delete urlDriverOptions[key]\n }\n }\n\n return Object.assign({}, options, urlDriverOptions)\n }\n return Object.assign({}, options)\n }\n\n /**\n * buildDriverOptions for MongodDB only to support replica set\n */\n static buildMongoDBDriverOptions(\n options: any,\n buildOptions?: { useSid: boolean },\n ): any {\n if (options.url) {\n const urlDriverOptions = this.parseMongoDBConnectionUrl(\n options.url,\n ) as { [key: string]: any }\n\n if (\n buildOptions &&\n buildOptions.useSid &&\n urlDriverOptions.database\n ) {\n urlDriverOptions.sid = urlDriverOptions.database\n }\n\n for (const key of Object.keys(urlDriverOptions)) {\n if (typeof urlDriverOptions[key] === \"undefined\") {\n delete urlDriverOptions[key]\n }\n }\n\n return Object.assign({}, options, urlDriverOptions)\n }\n return Object.assign({}, options)\n }\n\n /**\n * Joins and shortens alias if needed.\n *\n * If the alias length is greater than the limit allowed by the current\n * driver, replaces it with a shortend string, if the shortend string\n * is still too long, it will then hash the alias.\n *\n * @param driver Current `Driver`.\n * @param buildOptions Optional settings.\n * @param alias Alias parts.\n *\n * @return An alias that is no longer than the divers max alias length.\n */\n static buildAlias(\n { maxAliasLength }: Driver,\n buildOptions: { shorten?: boolean; joiner?: string } | undefined,\n ...alias: string[]\n ): string {\n const joiner =\n buildOptions && buildOptions.joiner ? buildOptions.joiner : \"_\"\n\n let newAlias = alias.length === 1 ? alias[0] : alias.join(joiner)\n\n if (\n maxAliasLength &&\n maxAliasLength > 0 &&\n newAlias.length > maxAliasLength\n ) {\n if (buildOptions && buildOptions.shorten === true) {\n const shortenedAlias = shorten(newAlias)\n if (shortenedAlias.length < maxAliasLength) {\n return shortenedAlias\n }\n }\n\n return hash(newAlias, { length: maxAliasLength })\n }\n\n return newAlias\n }\n\n /**\n * @deprecated use `buildAlias` instead.\n */\n static buildColumnAlias(\n { maxAliasLength }: Driver,\n buildOptions: { shorten?: boolean; joiner?: string } | string,\n ...alias: string[]\n ) {\n if (typeof buildOptions === \"string\") {\n alias.unshift(buildOptions)\n buildOptions = { shorten: false, joiner: \"_\" }\n } else {\n buildOptions = Object.assign(\n { shorten: false, joiner: \"_\" },\n buildOptions,\n )\n }\n return this.buildAlias(\n { maxAliasLength } as Driver,\n buildOptions,\n ...alias,\n )\n }\n\n // -------------------------------------------------------------------------\n // Private Static Methods\n // -------------------------------------------------------------------------\n\n /**\n * Extracts connection data from the connection url.\n */\n private static parseConnectionUrl(url: string) {\n const type = url.split(\":\")[0]\n const firstSlashes = url.indexOf(\"//\")\n const preBase = url.substr(firstSlashes + 2)\n const secondSlash = preBase.indexOf(\"/\")\n const base =\n secondSlash !== -1 ? preBase.substr(0, secondSlash) : preBase\n let afterBase =\n secondSlash !== -1 ? preBase.substr(secondSlash + 1) : undefined\n // remove mongodb query params\n if (afterBase && afterBase.indexOf(\"?\") !== -1) {\n afterBase = afterBase.substr(0, afterBase.indexOf(\"?\"))\n }\n\n const lastAtSign = base.lastIndexOf(\"@\")\n const usernameAndPassword = base.substr(0, lastAtSign)\n const hostAndPort = base.substr(lastAtSign + 1)\n\n let username = usernameAndPassword\n let password = \"\"\n const firstColon = usernameAndPassword.indexOf(\":\")\n if (firstColon !== -1) {\n username = usernameAndPassword.substr(0, firstColon)\n password = usernameAndPassword.substr(firstColon + 1)\n }\n const [host, port] = hostAndPort.split(\":\")\n\n return {\n type: type,\n host: host,\n username: decodeURIComponent(username),\n password: decodeURIComponent(password),\n port: port ? parseInt(port) : undefined,\n database: afterBase || undefined,\n }\n }\n\n /**\n * Extracts connection data from the connection url for MongoDB to support replica set.\n */\n private static parseMongoDBConnectionUrl(url: string) {\n const type = url.split(\":\")[0]\n const firstSlashes = url.indexOf(\"//\")\n const preBase = url.substr(firstSlashes + 2)\n const secondSlash = preBase.indexOf(\"/\")\n const base =\n secondSlash !== -1 ? preBase.substr(0, secondSlash) : preBase\n let afterBase =\n secondSlash !== -1 ? preBase.substr(secondSlash + 1) : undefined\n let afterQuestionMark = \"\"\n let host = undefined\n let port = undefined\n let hostReplicaSet = undefined\n let replicaSet = undefined\n\n let optionsObject: any = {}\n\n if (afterBase && afterBase.indexOf(\"?\") !== -1) {\n // split params\n afterQuestionMark = afterBase.substr(\n afterBase.indexOf(\"?\") + 1,\n afterBase.length,\n )\n\n const optionsList = afterQuestionMark.split(\"&\")\n let optionKey: string\n let optionValue: string\n\n // create optionsObject for merge with connectionUrl object before return\n optionsList.forEach((optionItem) => {\n optionKey = optionItem.split(\"=\")[0]\n optionValue = optionItem.split(\"=\")[1]\n optionsObject[optionKey] = optionValue\n })\n\n // specific replicaSet value to set options about hostReplicaSet\n replicaSet = optionsObject[\"replicaSet\"]\n afterBase = afterBase.substr(0, afterBase.indexOf(\"?\"))\n }\n\n const lastAtSign = base.lastIndexOf(\"@\")\n const usernameAndPassword = base.substr(0, lastAtSign)\n const hostAndPort = base.substr(lastAtSign + 1)\n\n let username = usernameAndPassword\n let password = \"\"\n const firstColon = usernameAndPassword.indexOf(\":\")\n if (firstColon !== -1) {\n username = usernameAndPassword.substr(0, firstColon)\n password = usernameAndPassword.substr(firstColon + 1)\n }\n\n // If replicaSet have value set It as hostlist, If not set like standalone host\n if (replicaSet) {\n hostReplicaSet = hostAndPort\n } else {\n ;[host, port] = hostAndPort.split(\":\")\n }\n\n let connectionUrl: any = {\n type: type,\n host: host,\n hostReplicaSet: hostReplicaSet,\n username: decodeURIComponent(username),\n password: decodeURIComponent(password),\n port: port ? parseInt(port) : undefined,\n database: afterBase || undefined,\n }\n\n // Loop to set every options in connectionUrl to object\n for (const [key, value] of Object.entries(optionsObject)) {\n connectionUrl[key] = value\n }\n\n return connectionUrl\n }\n}\n"],"sourceRoot":".."}
@@ -61,12 +61,13 @@ export class AuroraMysqlQueryRunner extends BaseQueryRunner {
61
61
  throw err;
62
62
  }
63
63
  if (this.transactionDepth === 0) {
64
+ this.transactionDepth += 1;
64
65
  await this.client.startTransaction();
65
66
  }
66
67
  else {
67
- await this.query(`SAVEPOINT typeorm_${this.transactionDepth}`);
68
+ this.transactionDepth += 1;
69
+ await this.query(`SAVEPOINT typeorm_${this.transactionDepth - 1}`);
68
70
  }
69
- this.transactionDepth += 1;
70
71
  await this.broadcaster.broadcast("AfterTransactionStart");
71
72
  }
72
73
  /**
@@ -78,13 +79,14 @@ export class AuroraMysqlQueryRunner extends BaseQueryRunner {
78
79
  throw new TransactionNotStartedError();
79
80
  await this.broadcaster.broadcast("BeforeTransactionCommit");
80
81
  if (this.transactionDepth > 1) {
81
- await this.query(`RELEASE SAVEPOINT typeorm_${this.transactionDepth - 1}`);
82
+ this.transactionDepth -= 1;
83
+ await this.query(`RELEASE SAVEPOINT typeorm_${this.transactionDepth}`);
82
84
  }
83
85
  else {
86
+ this.transactionDepth -= 1;
84
87
  await this.client.commitTransaction();
85
88
  this.isTransactionActive = false;
86
89
  }
87
- this.transactionDepth -= 1;
88
90
  await this.broadcaster.broadcast("AfterTransactionCommit");
89
91
  }
90
92
  /**
@@ -96,13 +98,14 @@ export class AuroraMysqlQueryRunner extends BaseQueryRunner {
96
98
  throw new TransactionNotStartedError();
97
99
  await this.broadcaster.broadcast("BeforeTransactionRollback");
98
100
  if (this.transactionDepth > 1) {
99
- await this.query(`ROLLBACK TO SAVEPOINT typeorm_${this.transactionDepth - 1}`);
101
+ this.transactionDepth -= 1;
102
+ await this.query(`ROLLBACK TO SAVEPOINT typeorm_${this.transactionDepth}`);
100
103
  }
101
104
  else {
105
+ this.transactionDepth -= 1;
102
106
  await this.client.rollbackTransaction();
103
107
  this.isTransactionActive = false;
104
108
  }
105
- this.transactionDepth -= 1;
106
109
  await this.broadcaster.broadcast("AfterTransactionRollback");
107
110
  }
108
111
  /**