build: merge branch 'main' into v6

WikiRik · web-flow · commit ce19b3da7557 · 2022-06-24T11:07:27.000Z
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,8 +20,8 @@ jobs:
       DIALECT: postgres
       SEQ_PORT: 54320
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
       - run: yarn install --frozen-lockfile --ignore-engines
@@ -41,8 +41,8 @@ jobs:
       DIALECT: mysql
       SEQ_PORT: 33060
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
       - run: yarn install --frozen-lockfile --ignore-engines
@@ -61,8 +61,8 @@ jobs:
     env:
       DIALECT: sqlite
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
       - run: yarn install --frozen-lockfile --ignore-engines
@@ -82,8 +82,8 @@ jobs:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
           node-version: 16.x
       - run: yarn install --frozen-lockfile
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -0,0 +1,31 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript' ]
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v2
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2
diff --git a/package.json b/package.json
@@ -2,6 +2,7 @@
   "name": "sequelize-cli",
   "version": "6.3.0",
   "description": "The Sequelize CLI",
+  "types": "./types.d.ts",
   "bin": {
     "sequelize": "./lib/sequelize",
     "sequelize-cli": "./lib/sequelize"
@@ -19,29 +20,29 @@
     "yargs": "^16.2.0"
   },
   "devDependencies": {
-    "@babel/cli": "^7.16.0",
-    "@babel/core": "^7.16.0",
-    "@babel/preset-env": "^7.16.0",
-    "@babel/register": "^7.16.0",
-    "@commitlint/cli": "^14.1.0",
-    "@commitlint/config-angular": "^14.1.0",
-    "bluebird": "^3.7.2",
-    "eslint": "^7.32.0",
-    "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-prettier": "^4.0.0",
-    "expect.js": "^0.3.1",
-    "gulp": "^4.0.2",
-    "husky": "^7.0.4",
-    "lint-staged": "^11.2.6",
-    "mocha": "^8.4.0",
+    "@babel/cli": "7.17.10",
+    "@babel/core": "7.18.5",
+    "@babel/preset-env": "7.18.2",
+    "@babel/register": "7.17.7",
+    "@commitlint/cli": "17.0.2",
+    "@commitlint/config-angular": "17.0.0",
+    "bluebird": "3.7.2",
+    "eslint": "7.32.0",
+    "eslint-config-prettier": "8.5.0",
+    "eslint-plugin-prettier": "4.0.0",
+    "expect.js": "0.3.1",
+    "gulp": "4.0.2",
+    "husky": "8.0.1",
+    "lint-staged": "13.0.2",
+    "mocha": "9.2.2",
     "mysql2": "latest",
     "pg": "latest",
     "pg-hstore": "latest",
-    "prettier": "^2.4.1",
-    "semver": "^7.3.5",
-    "sequelize": "^6.9.0",
+    "prettier": "2.7.1",
+    "semver": "7.3.7",
+    "sequelize": "6.21.0",
     "sqlite3": "latest",
-    "through2": "^4.0.2"
+    "through2": "4.0.2"
   },
   "prettier": {
     "trailingComma": "es5",
diff --git a/renovate.json b/renovate.json
@@ -1,5 +1,7 @@
 {
   "extends": [
-    "config:base"
+    "config:js-lib",
+    ":semanticCommitType(build)",
+    ":maintainLockFilesWeekly"
   ]
 }
diff --git a/src/assets/migrations/create-table.js b/src/assets/migrations/create-table.js
@@ -1,5 +1,6 @@
 'use strict';
 
+/** @type {import('sequelize-cli').Migration} */
 module.exports = {
   async up (queryInterface, Sequelize) {
     await queryInterface.createTable('<%= tableName %>', {
diff --git a/src/assets/migrations/skeleton.js b/src/assets/migrations/skeleton.js
@@ -1,5 +1,6 @@
 'use strict';
 
+/** @type {import('sequelize-cli').Migration} */
 module.exports = {
   async up (queryInterface, Sequelize) {
     /**
diff --git a/src/assets/seeders/skeleton.js b/src/assets/seeders/skeleton.js
@@ -1,5 +1,6 @@
 'use strict';
 
+/** @type {import('sequelize-cli').Migration} */
 module.exports = {
   async up (queryInterface, Sequelize) {
     /**
diff --git a/src/commands/migrate.js b/src/commands/migrate.js
@@ -17,6 +17,12 @@ exports.builder = (yargs) =>
     .option('from', {
       describe: 'Migration name to start migrations from (excluding)',
       type: 'string',
+    })
+    .option('name', {
+      describe:
+        'Migration name. When specified, only this migration will be run. Mutually exclusive with --to and --from',
+      type: 'string',
+      conflicts: ['to', 'from'],
     }).argv;
 
 exports.handler = async function (args) {
@@ -80,7 +86,13 @@ function migrate(args) {
           }
           return options;
         })
-        .then((options) => migrator.up(options));
+        .then((options) => {
+          if (args.name) {
+            return migrator.up(args.name);
+          } else {
+            return migrator.up(options);
+          }
+        });
     })
     .catch((e) => helpers.view.error(e));
 }
diff --git a/test/db/migrate.test.js b/test/db/migrate.test.js
@@ -580,6 +580,42 @@ describe(Support.getTestDialectTeaser('db:migrate'), () => {
         });
       });
     });
+
+    it('--name', function (done) {
+      const migrationsPath = Support.resolveSupportPath('assets', 'migrations');
+      const migrations = fs.readdirSync(migrationsPath);
+      const createPersonMigration = migrations.find((migration) =>
+        migration.includes('createPerson')
+      );
+
+      prepare(`--name ${createPersonMigration}`, () => {
+        helpers.readTables(this.sequelize, (tables) => {
+          expect(tables).to.eql(['Person', 'SequelizeMeta']);
+          done();
+        });
+      });
+    });
+
+    it('--name array', function (done) {
+      const migrationsPath = Support.resolveSupportPath('assets', 'migrations');
+      const migrations = fs.readdirSync(migrationsPath);
+      const createPersonMigration = migrations.find((migration) =>
+        migration.includes('createPerson')
+      );
+      const createPostMigration = migrations.find((migration) =>
+        migration.includes('createPost')
+      );
+
+      prepare(
+        `--name ${createPersonMigration} --name ${createPostMigration}`,
+        () => {
+          helpers.readTables(this.sequelize, (tables) => {
+            expect(tables).to.eql(['Person', 'Post', 'SequelizeMeta']);
+            done();
+          });
+        }
+      );
+    });
   });
 });
 
diff --git a/types.d.ts b/types.d.ts
@@ -0,0 +1,10 @@
+export interface Migration {
+  up(
+    queryInterface: import('sequelize').QueryInterface,
+    Sequelize: typeof import('sequelize')
+  ): Promise<void>;
+  down(
+    queryInterface: import('sequelize').QueryInterface,
+    Sequelize: typeof import('sequelize')
+  ): Promise<void>;
+}
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"extends": [`
`3`		`- "config:base"`
	`3`	`+ "config:js-lib",`
	`4`	`+ ":semanticCommitType(build)",`
	`5`	`+ ":maintainLockFilesWeekly"`
`4`	`6`	`]`
`5`	`7`	`}`