@primate/core 0.6.1 → 0.6.2

package/lib/private/db/migrate/create.js

@@ -1,6 +1,6 @@
 import E from "#db/errors";
 import bundle from "#db/migrate/bundle";
-import store from "#db/migrate/store";
+import toMigrationStore from "#db/migrate/store";
 import c from "@rcompat/cli/color";
 import print from "@rcompat/cli/print";
 import is_cancel from "@rcompat/cli/prompts/is-cancel";
@@ -47,7 +47,7 @@ export default async function create_migration(desc) {
         throw E.store_directory_empty();
     let next = 1;
     if (await migrations.exists()) {
-        const Migration = await store();
+        const Migration = await toMigrationStore();
         await Migration.table.create();
         const last = await Migration.find({ limit: 1, sort: { id: "desc" } });
         const last_id = last.length === 0 ? 0 : last[0].id;
@@ -62,17 +62,22 @@ export default async function create_migration(desc) {
     ${store_files.map((_, i) => `s${i}`).join(",\n ")}\n];`;
     const stores = await bundle(entry);
     const diffs = [];
-    const migration_stores = stores.filter(s => s.migrate);
+    const seen = new Set();
+    const migration_stores = [];
     const names = new Map();
     for (let i = 0; i < store_files.length; i++) {
         const file = store_files[i];
         const store = stores[i];
         if (!store.migrate)
             continue;
+        if (seen.has(store.id))
+            continue;
+        seen.add(store.id);
+        migration_stores.push(store);
         const existing = names.get(store.name) ?? [];
         names.set(store.name, [...existing, file.name]);
     }
-    const conflicts = [...names.entries()].filter(([, files]) => files.length > 1);
+    const conflicts = [...names].filter(([, files]) => files.length > 1);
     if (conflicts.length > 0) {
         const messages = conflicts
             .map(([name, files]) => `table "${name}" claimed by: ${files.join(", ")}`)

package/lib/private/orm/store.d.ts

@@ -80,6 +80,7 @@ type WithRelations<Base, Relations extends Dict<Relation>, W extends With<Relati
 type Init<S extends StoreInput, R extends Dict<Relation>> = {
     name: string;
     db: DB;
+    id?: symbol;
     schema: S;
     relations?: R;
     migrate?: boolean;
@@ -104,6 +105,7 @@ export declare class Store<T extends StoreInput, R extends Dict<Relation> = Empt
     get schema(): Dict<Storable<keyof import("pema").DataType, unknown>>;
     get type(): StoreType<ExtractSchema<T>>;
     get migrate(): boolean;
+    get id(): symbol;
     get name(): string;
     get pk(): PK;
     get db(): DB;

package/lib/private/orm/store.js

@@ -64,6 +64,7 @@ const DATE_OPS = ["$before", "$after", "$ne"];
  * CRUD/query API.
  */
 export class Store {
+    #input;
     #schema;
     #type;
     #types;
@@ -75,9 +76,10 @@ export class Store {
     #fks;
     #relations;
     #migrate;
+    #id;
     constructor(init) {
+        const { name, db, migrate, id } = init;
         const { pk, generate_pk, fks, schema } = parse(init.schema);
-        const { name, db, migrate } = init;
         if (name === undefined)
             throw E.store_name_required();
         assert.string(name);
@@ -87,6 +89,8 @@ export class Store {
         assert.dict(schema);
         assert.maybe.boolean(migrate);
         assert.maybe.dict(init.extend);
+        assert.maybe.symbol(id);
+        this.#id = id ?? Symbol();
         this.#schema = schema;
         this.#type = new StoreType(schema, pk);
         this.#types = Object.fromEntries(Object.entries(schema).map(([key, value]) => [key, value.datatype]));
@@ -95,6 +99,7 @@ export class Store {
         this.#pk = pk;
         this.#generate_pk = generate_pk;
         this.#fks = fks;
+        this.#input = init.schema;
         this.#relations = init.relations ?? {};
         this.#migrate = migrate ?? true;
         for (const relation of Object.keys(this.#relations)) {
@@ -144,6 +149,9 @@ export class Store {
     get migrate() {
         return this.#migrate;
     }
+    get id() {
+        return this.#id;
+    }
     get name() {
         return this.#name;
     }
@@ -528,9 +536,10 @@ export class Store {
         return new Store({
             name: this.name,
             db: this.db,
-            schema: this.#schema,
+            schema: this.#input,
             relations: this.#relations,
-            migrate: false,
+            migrate: this.#migrate,
+            id: this.#id,
             extend: extensor(this),
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@primate/core",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "description": "The universal web framework",
   "homepage": "https://primate.run",
   "bugs": "https://github.com/primate-run/primate/issues",