@lakutata/orm 3.1.4 → 3.1.6

package/README.md

@@ -500,7 +500,8 @@ The generated file follows TypeORM's style (double quotes, semicolons): format i
 linter. The process exits with code 0 once the command is done, and with code 1 when it fails: an invalid
 `MIGRATION_TRANSACTION`, an unknown `MIGRATION_DATABASE`, no database (except with `MIGRATION_GENERATE`, which then
 exits with 0), `MIGRATION_REVERT` with several databases and no `MIGRATION_DATABASE`, a database that does not connect,
-a migration that fails (the databases after it are skipped), or `MIGRATION_GENERATE` finding no change in any database.
+or a migration that fails (the databases after it are skipped). When `MIGRATION_GENERATE` finds no change in any
+database, the process exits with 0.
 
 The entities of a database are those of its connection options, plus, for a `Database` provider, those of its
 `entities` option.

package/README.zh-CN.md

@@ -410,7 +410,7 @@ MIGRATION_RUN=1 node build/App.js
 MIGRATION_REVERT=1 MIGRATION_DATABASE=db node build/App.js
 ```
 
-生成的文件遵循 TypeORM 的代码风格（双引号、分号）：请格式化它，或者让 linter 跳过迁移文件。命令完成后，进程以退出码 0 退出；失败时以退出码 1 退出，失败的情况包括：无效的 `MIGRATION_TRANSACTION`、未知的 `MIGRATION_DATABASE`、没有数据库（`MIGRATION_GENERATE` 除外，这时以 0 退出）、有多个数据库时使用 `MIGRATION_REVERT` 却没有指定 `MIGRATION_DATABASE`、数据库连接不上、迁移失败（之后的数据库会被跳过），或者 `MIGRATION_GENERATE` 在所有数据库中都没有发现变化。
+生成的文件遵循 TypeORM 的代码风格（双引号、分号）：请格式化它，或者让 linter 跳过迁移文件。命令完成后，进程以退出码 0 退出；失败时以退出码 1 退出，失败的情况包括：无效的 `MIGRATION_TRANSACTION`、未知的 `MIGRATION_DATABASE`、没有数据库（`MIGRATION_GENERATE` 除外，这时以 0 退出）、有多个数据库时使用 `MIGRATION_REVERT` 却没有指定 `MIGRATION_DATABASE`、数据库连接不上，或者迁移失败（之后的数据库会被跳过）。`MIGRATION_GENERATE` 在所有数据库中都没有发现变化时，以 0 退出。
 
 数据库的实体就是它连接选项中的实体；对于 `Database` 提供者，还要加上它 `entities` 选项中的实体。
 

package/dist/cjs/lib/ConnectionOptions.d.ts

@@ -3,7 +3,9 @@ import { type DataSourceOptions } from '../../vendor/typeorm/data-source/DataSou
  * The connection options with the defaults of the framework: the null and undefined values of the where conditions
  * ignored (the condition on the property left out), as TypeORM 0.3 did, where TypeORM 1 throws by default. Each key of
  * the `invalidWhereValuesBehavior` of the options replaces its default (`{undefined: 'throw'}` throws on the undefined
- * values and still ignores the null values).
+ * values and still ignores the null values). The paths given with an alias of the application (`@data/app.sqlite`) are
+ * resolved: the file of the database (`database`, `location` of sql.js) and the globs of the entities, the migrations
+ * and the subscribers.
  * @param options The connection options.
  * @returns The connection options with the defaults.
  */

package/dist/cjs/lib/ConnectionOptions.js

@@ -1,17 +1,60 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.connectionOptionsOf = connectionOptionsOf;
+const node_path_1 = __importDefault(require("node:path"));
+/**
+ * The option of the file (or the directory) of each driver keeping its database in the file system
+ */
+const FILE_OPTIONS = {
+    'better-sqlite3': 'database',
+    'mongo-embedded': 'database',
+    'sqljs': 'location'
+};
+/**
+ * A path given with an alias of the application (`@data/app.sqlite`) resolved as `path.resolve()` resolves it once the
+ * application declared its aliases; any other value as it is
+ * @param value
+ */
+function resolveAlias(value) {
+    return (typeof value === 'string' && value.startsWith('@') ? node_path_1.default.resolve(value) : value);
+}
+/**
+ * The paths of a list of the options (the globs of the entities, the migrations, the subscribers) resolved
+ * @param list
+ */
+function resolveAliases(list) {
+    if (Array.isArray(list))
+        return list.map(resolveAlias);
+    if (list && typeof list === 'object')
+        return Object.fromEntries(Object.entries(list).map(([name, value]) => [name, resolveAlias(value)]));
+    return list;
+}
 /**
  * The connection options with the defaults of the framework: the null and undefined values of the where conditions
  * ignored (the condition on the property left out), as TypeORM 0.3 did, where TypeORM 1 throws by default. Each key of
  * the `invalidWhereValuesBehavior` of the options replaces its default (`{undefined: 'throw'}` throws on the undefined
- * values and still ignores the null values).
+ * values and still ignores the null values). The paths given with an alias of the application (`@data/app.sqlite`) are
+ * resolved: the file of the database (`database`, `location` of sql.js) and the globs of the entities, the migrations
+ * and the subscribers.
  * @param options The connection options.
  * @returns The connection options with the defaults.
  */
 function connectionOptionsOf(options) {
+    const given = options;
+    //The options given only: an option left out stays out
+    const paths = {};
+    const file = FILE_OPTIONS[options.type];
+    if (file && given[file] !== undefined)
+        paths[file] = resolveAlias(given[file]);
+    for (const list of ['entities', 'migrations', 'subscribers'])
+        if (given[list] !== undefined)
+            paths[list] = resolveAliases(given[list]);
     return {
         ...options,
+        ...paths,
         invalidWhereValuesBehavior: { null: 'ignore', undefined: 'ignore', ...options.invalidWhereValuesBehavior }
     };
 }

package/dist/cjs/providers/migration/GenerateMigration.d.ts

@@ -4,7 +4,7 @@ import { type DataSourceOptions } from '../../../vendor/typeorm/data-source/Data
  * Generate the migration of the changes of the schema of a database of the application (MIGRATION_GENERATE): its
  * entities compared with the schema of the database, the queries of the changes written to a migration file of the
  * directory path. Each database has its provider, in the order of the run; the last one exits the application (with
- * the code 1 when no database had a change, or on a failure)
+ * the code 0 when no database had a change, 1 on a failure)
  */
 export declare class GenerateMigration extends Provider {
     #private;
@@ -38,10 +38,6 @@ export declare class GenerateMigration extends Provider {
      * directory
      */
     protected get filename(): string;
-    /**
-     * The migrations generated by the run (its databases share the process)
-     */
-    protected static generated: number;
     /**
      * Initializer: the database connected without its synchronization nor its migrations, then the migration generated
      * @protected

package/dist/cjs/providers/migration/GenerateMigration.js

@@ -33,10 +33,9 @@ const ConnectionOptions_js_1 = require("../../lib/ConnectionOptions.js");
  * Generate the migration of the changes of the schema of a database of the application (MIGRATION_GENERATE): its
  * entities compared with the schema of the database, the queries of the changes written to a migration file of the
  * directory path. Each database has its provider, in the order of the run; the last one exits the application (with
- * the code 1 when no database had a change, or on a failure)
+ * the code 0 when no database had a change, 1 on a failure)
  */
-let GenerateMigration = class GenerateMigration extends core_1.Provider {
-    static { GenerateMigration_1 = this; }
+let GenerateMigration = GenerateMigration_1 = class GenerateMigration extends core_1.Provider {
     /**
      * The extension of the migration file
      */
@@ -52,10 +51,6 @@ let GenerateMigration = class GenerateMigration extends core_1.Provider {
     }
     #app;
     #dataSource;
-    /**
-     * The migrations generated by the run (its databases share the process)
-     */
-    static { this.generated = 0; }
     /**
      * Initializer: the database connected without its synchronization nor its migrations, then the migration generated
      * @protected
@@ -133,8 +128,8 @@ let GenerateMigration = class GenerateMigration extends core_1.Provider {
                 else {
                     console.log(ansis_1.default.yellow `No changes in database schema were found`);
                     if (this.exitProcess) {
-                        //The code 1 when no database of the run had a change
-                        return this.#app.exit(GenerateMigration_1.generated ? 0 : 1);
+                        //Nothing to generate is not a failure: the tools running the command go on
+                        return this.#app.exit(0);
                     }
                     else {
                         return;
@@ -153,7 +148,6 @@ let GenerateMigration = class GenerateMigration extends core_1.Provider {
                 //Changes found in check mode: the code 1, as the check of TypeORM
                 return this.#app.exit(1);
             }
-            GenerateMigration_1.generated++;
             if (this.dryRun) {
                 console.log(ansis_1.default.green(`Migration ${ansis_1.default.blue(this.path + this.extension)} has content:\n\n${ansis_1.default.white(fileContent)}`));
                 if (this.exitProcess)

package/dist/esm/lib/ConnectionOptions.js

@@ -1,14 +1,54 @@
+import path from 'node:path';
+/**
+ * The option of the file (or the directory) of each driver keeping its database in the file system
+ */
+const FILE_OPTIONS = {
+    'better-sqlite3': 'database',
+    'mongo-embedded': 'database',
+    'sqljs': 'location'
+};
+/**
+ * A path given with an alias of the application (`@data/app.sqlite`) resolved as `path.resolve()` resolves it once the
+ * application declared its aliases; any other value as it is
+ * @param value
+ */
+function resolveAlias(value) {
+    return (typeof value === 'string' && value.startsWith('@') ? path.resolve(value) : value);
+}
+/**
+ * The paths of a list of the options (the globs of the entities, the migrations, the subscribers) resolved
+ * @param list
+ */
+function resolveAliases(list) {
+    if (Array.isArray(list))
+        return list.map(resolveAlias);
+    if (list && typeof list === 'object')
+        return Object.fromEntries(Object.entries(list).map(([name, value]) => [name, resolveAlias(value)]));
+    return list;
+}
 /**
  * The connection options with the defaults of the framework: the null and undefined values of the where conditions
  * ignored (the condition on the property left out), as TypeORM 0.3 did, where TypeORM 1 throws by default. Each key of
  * the `invalidWhereValuesBehavior` of the options replaces its default (`{undefined: 'throw'}` throws on the undefined
- * values and still ignores the null values).
+ * values and still ignores the null values). The paths given with an alias of the application (`@data/app.sqlite`) are
+ * resolved: the file of the database (`database`, `location` of sql.js) and the globs of the entities, the migrations
+ * and the subscribers.
  * @param options The connection options.
  * @returns The connection options with the defaults.
  */
 export function connectionOptionsOf(options) {
+    const given = options;
+    //The options given only: an option left out stays out
+    const paths = {};
+    const file = FILE_OPTIONS[options.type];
+    if (file && given[file] !== undefined)
+        paths[file] = resolveAlias(given[file]);
+    for (const list of ['entities', 'migrations', 'subscribers'])
+        if (given[list] !== undefined)
+            paths[list] = resolveAliases(given[list]);
     return {
         ...options,
+        ...paths,
         invalidWhereValuesBehavior: { null: 'ignore', undefined: 'ignore', ...options.invalidWhereValuesBehavior }
     };
 }

package/dist/esm/providers/migration/GenerateMigration.js

@@ -27,10 +27,9 @@ import { connectionOptionsOf } from '../../lib/ConnectionOptions.js';
  * Generate the migration of the changes of the schema of a database of the application (MIGRATION_GENERATE): its
  * entities compared with the schema of the database, the queries of the changes written to a migration file of the
  * directory path. Each database has its provider, in the order of the run; the last one exits the application (with
- * the code 1 when no database had a change, or on a failure)
+ * the code 0 when no database had a change, 1 on a failure)
  */
-let GenerateMigration = class GenerateMigration extends Provider {
-    static { GenerateMigration_1 = this; }
+let GenerateMigration = GenerateMigration_1 = class GenerateMigration extends Provider {
     /**
      * The extension of the migration file
      */
@@ -46,10 +45,6 @@ let GenerateMigration = class GenerateMigration extends Provider {
     }
     #app;
     #dataSource;
-    /**
-     * The migrations generated by the run (its databases share the process)
-     */
-    static { this.generated = 0; }
     /**
      * Initializer: the database connected without its synchronization nor its migrations, then the migration generated
      * @protected
@@ -127,8 +122,8 @@ let GenerateMigration = class GenerateMigration extends Provider {
                 else {
                     console.log(ansi.yellow `No changes in database schema were found`);
                     if (this.exitProcess) {
-                        //The code 1 when no database of the run had a change
-                        return this.#app.exit(GenerateMigration_1.generated ? 0 : 1);
+                        //Nothing to generate is not a failure: the tools running the command go on
+                        return this.#app.exit(0);
                     }
                     else {
                         return;
@@ -147,7 +142,6 @@ let GenerateMigration = class GenerateMigration extends Provider {
                 //Changes found in check mode: the code 1, as the check of TypeORM
                 return this.#app.exit(1);
             }
-            GenerateMigration_1.generated++;
             if (this.dryRun) {
                 console.log(ansi.green(`Migration ${ansi.blue(this.path + this.extension)} has content:\n\n${ansi.white(fileContent)}`));
                 if (this.exitProcess)

package/dist/types/lib/ConnectionOptions.d.ts

@@ -3,7 +3,9 @@ import { type DataSourceOptions } from '#typeorm/data-source/DataSourceOptions.j
  * The connection options with the defaults of the framework: the null and undefined values of the where conditions
  * ignored (the condition on the property left out), as TypeORM 0.3 did, where TypeORM 1 throws by default. Each key of
  * the `invalidWhereValuesBehavior` of the options replaces its default (`{undefined: 'throw'}` throws on the undefined
- * values and still ignores the null values).
+ * values and still ignores the null values). The paths given with an alias of the application (`@data/app.sqlite`) are
+ * resolved: the file of the database (`database`, `location` of sql.js) and the globs of the entities, the migrations
+ * and the subscribers.
  * @param options The connection options.
  * @returns The connection options with the defaults.
  */

package/dist/types/providers/migration/GenerateMigration.d.ts

@@ -4,7 +4,7 @@ import { type DataSourceOptions } from '#typeorm/data-source/DataSourceOptions.j
  * Generate the migration of the changes of the schema of a database of the application (MIGRATION_GENERATE): its
  * entities compared with the schema of the database, the queries of the changes written to a migration file of the
  * directory path. Each database has its provider, in the order of the run; the last one exits the application (with
- * the code 1 when no database had a change, or on a failure)
+ * the code 0 when no database had a change, 1 on a failure)
  */
 export declare class GenerateMigration extends Provider {
     #private;
@@ -38,10 +38,6 @@ export declare class GenerateMigration extends Provider {
      * directory
      */
     protected get filename(): string;
-    /**
-     * The migrations generated by the run (its databases share the process)
-     */
-    protected static generated: number;
     /**
      * Initializer: the database connected without its synchronization nor its migrations, then the migration generated
      * @protected

package/dist/vendor/typeorm/driver/mongo-embedded/EmbeddedCollectionStore.js

@@ -4,10 +4,10 @@ exports.EmbeddedCollectionStore = exports.SCAN_TIMEOUT = exports.EmbeddedBulkWri
 const tslib_1 = require("tslib");
 const crypto_1 = require("crypto");
 const fs = tslib_1.__importStar(require("fs"));
-const zlib = tslib_1.__importStar(require("zlib"));
 const TypeORMError_1 = require("../../error/TypeORMError");
 const EmbeddedBTree_1 = require("./EmbeddedBTree");
 const EmbeddedCache_1 = require("./EmbeddedCache");
+const EmbeddedCrc32_1 = require("./EmbeddedCrc32");
 const EmbeddedKeyEncoding_1 = require("./EmbeddedKeyEncoding");
 const EmbeddedKeydir_1 = require("./EmbeddedKeydir");
 const EmbeddedLog_1 = require("./EmbeddedLog");
@@ -298,7 +298,7 @@ class EmbeddedCollectionStore {
         }
         let checksum = 0;
         for (const part of parts)
-            checksum = zlib.crc32(part, checksum);
+            checksum = (0, EmbeddedCrc32_1.crc32)(part, checksum);
         const crc = Buffer.allocUnsafe(4);
         crc.writeUInt32LE(checksum);
         const temporary = `${path}.tmp`;
@@ -346,7 +346,7 @@ class EmbeddedCollectionStore {
                 }
                 position += size;
                 if (checked)
-                    checksum = zlib.crc32(bytes, checksum);
+                    checksum = (0, EmbeddedCrc32_1.crc32)(bytes, checksum);
                 return bytes;
             };
             const skipPadding = () => {
@@ -443,7 +443,7 @@ class EmbeddedCollectionStore {
         const record = Buffer.allocUnsafe(length);
         this.fileOf(this.keydir.fileAt(slot)).readInto(record, 0, length, offset);
         const payload = record.subarray(EmbeddedLog_1.RECORD_HEADER);
-        if (zlib.crc32(payload, zlib.crc32(record.subarray(8, 9))) !==
+        if ((0, EmbeddedCrc32_1.crc32)(payload, (0, EmbeddedCrc32_1.crc32)(record.subarray(8, 9))) !==
             record.readUInt32LE(4))
             throw this.corrupted(offset);
         const document = this.values.deserialize(payload);