@yongdall/migrate 0.4.0 → 0.5.2

package/index.d.mts

@@ -1,4 +1,10 @@
+import { ModelTable } from "@yongdall/model";
+
 //#region cli/migrate/index.d.mts
+/**
+ * @typedef {object} Profile
+ * @property {ModelTable[]} models
+ */
 /**
  *
  * @param {object} [options]
@@ -16,5 +22,8 @@ declare function _default({
   database?: string | undefined;
   domain?: string | undefined;
 }): Promise<void>;
+type Profile = {
+  models: ModelTable[];
+};
 //#endregion
-export { _default as default };
+export { Profile, _default as default };

package/index.mjs

@@ -1,8 +1,13 @@
-import { connect } from "@yongdall/connection";
-import { hooks } from "@yongdall/core";
+import { useDatabase } from "@yongdall/connection";
 import { _run } from "@yongdall/context";
+import { loadPluginProfiles } from "@yongdall/plugins";
 
 //#region cli/migrate/index.mjs
+/** @import { ModelTable } from '@yongdall/model' */
+/**
+* @typedef {object} Profile
+* @property {ModelTable[]} models
+*/
 /**
 * 
 * @param {object} [options]
@@ -12,18 +17,25 @@ import { _run } from "@yongdall/context";
 * @returns {Promise<void>}
 */
 async function migrate_default({ plugins, database, domain } = {}) {
-	const list = [...new Set(plugins?.length ? [...hooks.get("migrationModels").entries()].filter((v) => plugins.includes(v[0])).map((v) => v[1]) : [...hooks.get("migrationModels").values()].filter(Boolean))];
+	const pluginSet = plugins?.length ? new Set(plugins) : null;
+	const modelList = await Array.fromAsync(loadPluginProfiles("migration", function* (config, plugin) {
+		if (!config) return;
+		if (pluginSet && !pluginSet.has(plugin)) return;
+		const models = config.models;
+		if (!Array.isArray(models)) return;
+		yield* models;
+	}));
 	return _run({ domain: domain || "" }, async () => {
 		if (typeof database === "string") {
 			const id = ["-_/"].includes(database) ? "" : database;
-			const models = list.filter((v) => (v.databaseId || "") === id);
-			await connect("rdb", id).transaction((t) => t.syncTables(models));
+			const models = modelList.filter((v) => (v.databaseId || "") === id);
+			await useDatabase(id).transaction((t) => t.syncTables(models));
 			return;
 		}
-		const models = Object.groupBy(list, (d) => d.databaseId || "");
+		const models = Object.groupBy(modelList, (d) => d.databaseId || "");
 		for (const [databaseId, list] of Object.entries(models)) {
 			if (!list) continue;
-			await connect("rdb", databaseId).transaction((t) => t.syncTables(list));
+			await useDatabase(databaseId).transaction((t) => t.syncTables(list));
 		}
 	});
 }

package/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","names":[],"sources":["../../cli/migrate/index.mjs"],"sourcesContent":["import { connect } from '@yongdall/connection';\nimport { hooks } from '@yongdall/core';\nimport { _run } from '@yongdall/context';\n\n\n/**\n * \n * @param {object} [options]\n * @param {string[]} [options.plugins]\n * @param {string} [options.database] \n * @param {string} [options.domain] \n * @returns {Promise<void>}\n */\nexport default async function ({\n\tplugins, database, domain\n} = {}) {\n\tconst list = [...new Set(plugins?.length\n\t\t? [...hooks.get('migrationModels').entries()]\n\t\t\t.filter(v => plugins.includes(v[0])).map((v) => v[1])\n\t\t: [...hooks.get('migrationModels').values()].filter(Boolean))];\n\treturn _run({domain: domain || ''}, async () => {\n\t\tif (typeof database === 'string') {\n\t\t\tconst id = ['-_/'].includes(database) ? '' : database;\n\t\t\tconst models = list.filter(v => (v.databaseId || '') === id);\n\t\t\tawait connect('rdb', id).transaction(t => t.syncTables(models));\n\t\t\treturn;\n\t\t}\n\t\tconst models = Object.groupBy(list, d => d.databaseId || '');\n\t\tfor (const [databaseId, list] of Object.entries(models)) {\n\t\t\tif (!list) { continue; }\n\t\t\tawait connect('rdb', databaseId).transaction(t => t.syncTables(list));\n\t\t}\n\n\t});\n}\n"],"mappings":";;;;;;;;;;;;;AAaA,+BAA+B,EAC9B,SAAS,UAAU,WAChB,EAAE,EAAE;CACP,MAAM,OAAO,CAAC,GAAG,IAAI,IAAI,SAAS,SAC/B,CAAC,GAAG,MAAM,IAAI,kBAAkB,CAAC,SAAS,CAAC,CAC3C,QAAO,MAAK,QAAQ,SAAS,EAAE,GAAG,CAAC,CAAC,KAAK,MAAM,EAAE,GAAG,GACpD,CAAC,GAAG,MAAM,IAAI,kBAAkB,CAAC,QAAQ,CAAC,CAAC,OAAO,QAAQ,CAAC,CAAC;AAC/D,QAAO,KAAK,EAAC,QAAQ,UAAU,IAAG,EAAE,YAAY;AAC/C,MAAI,OAAO,aAAa,UAAU;GACjC,MAAM,KAAK,CAAC,MAAM,CAAC,SAAS,SAAS,GAAG,KAAK;GAC7C,MAAM,SAAS,KAAK,QAAO,OAAM,EAAE,cAAc,QAAQ,GAAG;AAC5D,SAAM,QAAQ,OAAO,GAAG,CAAC,aAAY,MAAK,EAAE,WAAW,OAAO,CAAC;AAC/D;;EAED,MAAM,SAAS,OAAO,QAAQ,OAAM,MAAK,EAAE,cAAc,GAAG;AAC5D,OAAK,MAAM,CAAC,YAAY,SAAS,OAAO,QAAQ,OAAO,EAAE;AACxD,OAAI,CAAC,KAAQ;AACb,SAAM,QAAQ,OAAO,WAAW,CAAC,aAAY,MAAK,EAAE,WAAW,KAAK,CAAC;;GAGrE"}
+{"version":3,"file":"index.mjs","names":[],"sources":["../../cli/migrate/index.mjs"],"sourcesContent":["/** @import { ModelTable } from '@yongdall/model' */\nimport { useDatabase } from '@yongdall/connection';\nimport { _run } from '@yongdall/context';\nimport { loadPluginProfiles } from '@yongdall/plugins';\n\n/**\n * @typedef {object} Profile\n * @property {ModelTable[]} models\n */\n/**\n * \n * @param {object} [options]\n * @param {string[]} [options.plugins]\n * @param {string} [options.database] \n * @param {string} [options.domain] \n * @returns {Promise<void>}\n */\nexport default async function ({\n\tplugins, database, domain\n} = {}) {\n\tconst pluginSet = plugins?.length ? new Set(plugins) : null;\n\tconst modelList = await Array.fromAsync(\n\t\tloadPluginProfiles('migration', function* (/** @type {Partial<Profile>} */config, plugin) {\n\t\t\tif (!config) { return; }\n\t\t\tif (pluginSet && !pluginSet.has(plugin)) { return; }\n\t\t\tconst models = config.models;\n\t\t\tif (!Array.isArray(models)) { return; }\n\t\t\tyield* models;\n\t\t})\n\t);\n\treturn _run({ domain: domain || '' }, async () => {\n\t\tif (typeof database === 'string') {\n\t\t\tconst id = ['-_/'].includes(database) ? '' : database;\n\t\t\tconst models = modelList.filter(v => (v.databaseId || '') === id);\n\t\t\tawait useDatabase(id).transaction(t => t.syncTables(models));\n\t\t\treturn;\n\t\t}\n\t\tconst models = Object.groupBy(modelList, d => d.databaseId || '');\n\t\tfor (const [databaseId, list] of Object.entries(models)) {\n\t\t\tif (!list) { continue; }\n\t\t\tawait useDatabase(databaseId).transaction(t => t.syncTables(list));\n\t\t}\n\n\t});\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAiBA,+BAA+B,EAC9B,SAAS,UAAU,WAChB,EAAE,EAAE;CACP,MAAM,YAAY,SAAS,SAAS,IAAI,IAAI,QAAQ,GAAG;CACvD,MAAM,YAAY,MAAM,MAAM,UAC7B,mBAAmB,aAAa,WAA0C,QAAQ,QAAQ;AACzF,MAAI,CAAC,OAAU;AACf,MAAI,aAAa,CAAC,UAAU,IAAI,OAAO,CAAI;EAC3C,MAAM,SAAS,OAAO;AACtB,MAAI,CAAC,MAAM,QAAQ,OAAO,CAAI;AAC9B,SAAO;GACN,CACF;AACD,QAAO,KAAK,EAAE,QAAQ,UAAU,IAAI,EAAE,YAAY;AACjD,MAAI,OAAO,aAAa,UAAU;GACjC,MAAM,KAAK,CAAC,MAAM,CAAC,SAAS,SAAS,GAAG,KAAK;GAC7C,MAAM,SAAS,UAAU,QAAO,OAAM,EAAE,cAAc,QAAQ,GAAG;AACjE,SAAM,YAAY,GAAG,CAAC,aAAY,MAAK,EAAE,WAAW,OAAO,CAAC;AAC5D;;EAED,MAAM,SAAS,OAAO,QAAQ,YAAW,MAAK,EAAE,cAAc,GAAG;AACjE,OAAK,MAAM,CAAC,YAAY,SAAS,OAAO,QAAQ,OAAO,EAAE;AACxD,OAAI,CAAC,KAAQ;AACb,SAAM,YAAY,WAAW,CAAC,aAAY,MAAK,EAAE,WAAW,KAAK,CAAC;;GAGlE"}

package/package.json

@@ -1,23 +1,20 @@
 {
   "name": "@yongdall/migrate",
-  "version": "0.4.0",
+  "version": "0.5.2",
   "type": "module",
-  "bin": {
-    "migrate.yongdall": "./bin.mjs"
-  },
   "main": "./index.mjs",
   "imports": {
     "#index": "./index.mjs"
   },
   "dependencies": {
-    "@yongdall/plugins": "^0.4.0",
-    "@yongdall/context": "^0.4.0",
-    "@yongdall/core": "^0.4.0",
-    "@yongdall/init": "^0.4.0",
-    "@yongdall/connection": "^0.4.0"
+    "@yongdall/plugins": "^0.5.0",
+    "@yongdall/context": "^0.5.0",
+    "@yongdall/init": "^0.5.0",
+    "@yongdall/connection": "^0.5.0",
+    "@yongdall/model": "^0.5.0"
   },
   "devDependencies": {
-    "@yongdall/cli-parse": "^0.4.0"
+    "@yongdall/cli-parse": "^0.5.0"
   },
   "exports": {
     ".": "./index.mjs"

package/bin.mjs

@@ -1,20 +0,0 @@
-import { stop } from "@yongdall/connection";
-import init from "@yongdall/init";
-import migrate from "#index";
-
-//#region cli/migrate/bin.mjs
-let args = process.argv.slice(2);
-let index = args.indexOf("--");
-if (index >= 0) args = args.slice(0, index);
-await init({ development: args.includes("--development") });
-const domain = args.find((v) => v.startsWith("--domain="))?.slice(9) || "";
-const plugins = [...args.filter((v) => v.startsWith("--plugin=")).map((v) => v.slice(9)), ...args.filter((v) => v.startsWith("--plugins=")).map((v) => v.slice(10))].flatMap((v) => v.split(",")).filter(Boolean);
-const database = args.find((v) => v.startsWith("--database="))?.slice(11);
-migrate({
-	domain,
-	plugins,
-	database
-}).then(stop);
-
-//#endregion
-//# sourceMappingURL=bin.mjs.map

package/bin.mjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"bin.mjs","names":[],"sources":["../../cli/migrate/bin.mjs"],"sourcesContent":["import { stop } from '@yongdall/connection';\nimport init from '@yongdall/init';\nimport migrate from '#index';\n\n\n\nlet args = process.argv.slice(2);\nlet index = args.indexOf('--');\nif (index >= 0) {\n\targs = args.slice(0, index);\n}\nconst development = args.includes('--development');\nawait init({ development });\n\nconst domain = args.find(v => v.startsWith('--domain='))?.slice('--domain='.length) || '';\n\nconst plugins = [\n\t...args.filter(v => v.startsWith('--plugin=')).map(v => v.slice('--plugin='.length)),\n\t...args.filter(v => v.startsWith('--plugins=')).map(v => v.slice('--plugins='.length)),\n].flatMap(v => v.split(',')).filter(Boolean);\nconst database = args.find(v => v.startsWith('--database='))?.slice('--database='.length);\nmigrate({ domain, plugins, database }).then(stop);\n"],"mappings":";;;;;AAMA,IAAI,OAAO,QAAQ,KAAK,MAAM,EAAE;AAChC,IAAI,QAAQ,KAAK,QAAQ,KAAK;AAC9B,IAAI,SAAS,EACZ,QAAO,KAAK,MAAM,GAAG,MAAM;AAG5B,MAAM,KAAK,EAAE,aADO,KAAK,SAAS,gBAAgB,EACxB,CAAC;AAE3B,MAAM,SAAS,KAAK,MAAK,MAAK,EAAE,WAAW,YAAY,CAAC,EAAE,MAAM,EAAmB,IAAI;AAEvF,MAAM,UAAU,CACf,GAAG,KAAK,QAAO,MAAK,EAAE,WAAW,YAAY,CAAC,CAAC,KAAI,MAAK,EAAE,MAAM,EAAmB,CAAC,EACpF,GAAG,KAAK,QAAO,MAAK,EAAE,WAAW,aAAa,CAAC,CAAC,KAAI,MAAK,EAAE,MAAM,GAAoB,CAAC,CACtF,CAAC,SAAQ,MAAK,EAAE,MAAM,IAAI,CAAC,CAAC,OAAO,QAAQ;AAC5C,MAAM,WAAW,KAAK,MAAK,MAAK,EAAE,WAAW,cAAc,CAAC,EAAE,MAAM,GAAqB;AACzF,QAAQ;CAAE;CAAQ;CAAS;CAAU,CAAC,CAAC,KAAK,KAAK"}