Skip prefix on main script, to allow transition

voxpelli · Aug 6, 2023 · 036f6c3 · 036f6c3
1 parent f53d5f0
commit 036f6c3
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 17 deletions.
diff --git a/lib/advanced-types.d.ts b/lib/advanced-types.d.ts
@@ -12,6 +12,7 @@ export interface UmzeptionDependency<T extends AnyUmzeptionContext = AnyUmzeptio
 // The fully resolved internal definition
 export interface UmzeptionDefinition<T extends AnyUmzeptionContext = AnyUmzeptionContext> extends UmzeptionDependency<T> {
   name: string
+  noPrefix?: boolean
   pluginDir: string
 }
 

diff --git a/lib/lookup.js b/lib/lookup.js
@@ -35,6 +35,7 @@ export async function umzeptionLookup (options, context) {
     glob: [],
     installSchema: async () => {},
     name: 'main',
+    noPrefix: true,
     pluginDir: cwd,
     ...mainDefinitionExtras,
   };
@@ -47,8 +48,8 @@ export async function umzeptionLookup (options, context) {
   const definitions = [...dependencyDefinitions, mainDefinition];
 
   const installations = definitions.map(definition => {
-    // ':' instead of '|' to differentiate against migrations
-    const name = definition.name + ':install';
+    // ':' instead of '|' to differentiate against migrations, and keep ':' on prefix less to avoid clash with file names
+    const name = (definition.noPrefix ? '' : definition.name) + ':install';
 
     /** @type {import('umzug').RunnableMigration<T>} */
     const result = {

diff --git a/lib/resolve-migrations.js b/lib/resolve-migrations.js
@@ -5,12 +5,19 @@ import { importAbsolutePath } from 'plugin-importer';
 
 /**
  * @template {import('./advanced-types.d.ts').AnyUmzeptionContext} T
- * @param {Pick<import('./advanced-types.d.ts').UmzeptionDefinition<T>, 'glob' | 'name' | 'pluginDir'>} definition
+ * @param {Pick<import('./advanced-types.d.ts').UmzeptionDefinition<T>, 'glob' | 'name' | 'noPrefix' | 'pluginDir'>} definition
  * @param {T} _context
  * @param {boolean} [noop] - if set then the up/down migrations will have no operation
  * @returns {Promise<import('umzug').RunnableMigration<T>[]>}
  */
-export async function resolveMigrations ({ glob, name: definitionName, pluginDir }, _context, noop = false) {
+export async function resolveMigrations (definition, _context, noop = false) {
+  const {
+    glob,
+    name: definitionName,
+    noPrefix,
+    pluginDir,
+  } = definition;
+
   const files = await globby(glob, { cwd: pluginDir, absolute: true });
 
   return Promise.all(files.map(async file => {
@@ -37,7 +44,7 @@ export async function resolveMigrations ({ glob, name: definitionName, pluginDir
       throw new TypeError('Invalid migration, expected a "up" method');
     }
 
-    const name = definitionName + '|' + path.basename(file);
+    const name = (noPrefix ? '' : definitionName + '|') + path.basename(file);
 
     /** @type {import('umzug').RunnableMigration<T>} */
     const result = {

diff --git a/package.json b/package.json
@@ -46,7 +46,7 @@
     "clean": "run-p clean:*",
     "prepare": "husky install",
     "prepublishOnly": "run-s build",
-    "test:node": "c8 --reporter=lcov --reporter text node --test",
+    "test:node": "c8 --reporter=lcov --reporter text node --test test/*.spec.js",
     "test-ci": "run-s test:*",
     "test": "run-s check test:*"
   },

diff --git a/test/complex-integration.spec.js b/test/complex-integration.spec.js
@@ -70,11 +70,11 @@ describe('Complex Integration', () => {
       'test-dependency:install',
       'test-dependency-2:install',
       'test-dependency-3:install',
-      'main:install',
+      ':install',
       'test-dependency|foo-01.js',
       'test-dependency-2|bar-01.js',
       'test-dependency-3|abc-01.js',
-      'main|foo-01.js',
+      'foo-01.js',
     ]);
 
     assert.deepEqual(

diff --git a/test/integration.spec.js b/test/integration.spec.js
@@ -54,9 +54,9 @@ describe('Integration', () => {
 
     assert.deepStrictEqual(executed, [
       'test-dependency:install',
-      'main:install',
+      ':install',
       'test-dependency|foo-01.js',
-      'main|foo-01.js',
+      'foo-01.js',
     ]);
 
     assert.deepEqual(
@@ -91,9 +91,9 @@ describe('Integration', () => {
 
     assert.deepStrictEqual(executed, [
       'test-dependency:install',
-      'main:install',
+      ':install',
       'test-dependency|foo-01.js',
-      'main|foo-01.js',
+      'foo-01.js',
     ]);
 
     assert.deepEqual(
@@ -131,9 +131,9 @@ describe('Integration', () => {
 
     assert.deepStrictEqual(executed, [
       'test-dependency:install',
-      'main:install',
+      ':install',
       'test-dependency|foo-01.js',
-      'main|foo-01.js',
+      'foo-01.js',
     ]);
 
     assert.deepEqual(
@@ -169,7 +169,7 @@ describe('Integration', () => {
 
     assert.deepStrictEqual(executed, [
       'test-dependency:install',
-      'main:install',
+      ':install',
       'test-dependency|foo-01.js',
     ]);
 

diff --git a/test/pg-integration.spec.js b/test/pg-integration.spec.js
@@ -84,7 +84,7 @@ describe('PG Integration', () => {
       [
         'INSERT INTO umzeption_migrations (name) VALUES ($1)',
         [
-          'main:install',
+          ':install',
         ],
       ],
       [
@@ -96,7 +96,7 @@ describe('PG Integration', () => {
       [
         'INSERT INTO umzeption_migrations (name) VALUES ($1)',
         [
-          'main|foo-01.js',
+          'foo-01.js',
         ],
       ],
     ]);