depend on @minatojs/core only

.gitlab-ci.yml

@@ -47,6 +47,6 @@ deploy_npm:
   script:
     - apt update;apt -y install coreutils
     - echo $NPMRC | base64 --decode > ~/.npmrc
-    - npm publish . || true
+    - npm publish . --access public && curl -X PUT "https://registry-direct.npmmirror.com/$(cat package.json | jq '.name' | sed 's/\"//g')/sync?sync_upstream=true" || true
   only:
     - master

package-lock.json

@@ -29,7 +29,7 @@
         "typescript": "^4.6.3"
       },
       "peerDependencies": {
-        "minato": "^1.2.3"
+        "@minatojs/core": "^1.3.0"
       }
     },
     "node_modules/@ampproject/remapping": {
@@ -1003,6 +1003,15 @@
         "@jridgewell/sourcemap-codec": "^1.4.10"
       }
     },
+    "node_modules/@minatojs/core": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@minatojs/core/-/core-1.3.0.tgz",
+      "integrity": "sha512-MGO5gsfy4aDN8Ai0SvMYLaF4xqMLy3RyO2oeuTH7/wH5tS/dLscXvLy7wZf17XFRZJIDX/3qyiu2xQGw0lapXA==",
+      "peer": true,
+      "dependencies": {
+        "cosmokit": "^1.2.1"
+      }
+    },
     "node_modules/@minatojs/driver-memory": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/@minatojs/driver-memory/-/driver-memory-1.1.1.tgz",
@@ -4020,12 +4029,13 @@
       }
     },
     "node_modules/minato": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/minato/-/minato-1.2.3.tgz",
-      "integrity": "sha512-06+ytX+prjYykoaqYe48tAGRbbG5WME1MEpb1WQUPhT6qxGSYmeqJyFX97Hlux4HruJfKpRCzsX6dhYRc9XkTA==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/minato/-/minato-1.3.0.tgz",
+      "integrity": "sha512-28kGTxoosWCZb1RVHtPIJAO+2UvOkJZZmdqbcB0LuqjGiPPJPZ/JAtxv+08LIiAKucRl4XdWao2pYn6LHZDnhw==",
+      "dev": true,
       "peer": true,
       "dependencies": {
-        "cosmokit": "^1.2.1",
+        "@minatojs/core": "^1.3.0",
         "ns-require": "^1.1.4"
       }
     },
@@ -4090,6 +4100,7 @@
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/ns-require/-/ns-require-1.1.4.tgz",
       "integrity": "sha512-Zk25pQj4u5i6DS0vaNO5aSSXewybVqqVVjz8AOxFy9DNPtmu3jlexMz6kUXLV2oB+X6iQeAnHXSzj5Qz/IeDaQ==",
+      "dev": true,
       "peer": true
     },
     "node_modules/nwsapi": {
@@ -6083,6 +6094,15 @@
         "@jridgewell/sourcemap-codec": "^1.4.10"
       }
     },
+    "@minatojs/core": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@minatojs/core/-/core-1.3.0.tgz",
+      "integrity": "sha512-MGO5gsfy4aDN8Ai0SvMYLaF4xqMLy3RyO2oeuTH7/wH5tS/dLscXvLy7wZf17XFRZJIDX/3qyiu2xQGw0lapXA==",
+      "peer": true,
+      "requires": {
+        "cosmokit": "^1.2.1"
+      }
+    },
     "@minatojs/driver-memory": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/@minatojs/driver-memory/-/driver-memory-1.1.1.tgz",
@@ -8376,12 +8396,13 @@
       "dev": true
     },
     "minato": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/minato/-/minato-1.2.3.tgz",
-      "integrity": "sha512-06+ytX+prjYykoaqYe48tAGRbbG5WME1MEpb1WQUPhT6qxGSYmeqJyFX97Hlux4HruJfKpRCzsX6dhYRc9XkTA==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/minato/-/minato-1.3.0.tgz",
+      "integrity": "sha512-28kGTxoosWCZb1RVHtPIJAO+2UvOkJZZmdqbcB0LuqjGiPPJPZ/JAtxv+08LIiAKucRl4XdWao2pYn6LHZDnhw==",
+      "dev": true,
       "peer": true,
       "requires": {
-        "cosmokit": "^1.2.1",
+        "@minatojs/core": "^1.3.0",
         "ns-require": "^1.1.4"
       }
     },
@@ -8437,6 +8458,7 @@
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/ns-require/-/ns-require-1.1.4.tgz",
       "integrity": "sha512-Zk25pQj4u5i6DS0vaNO5aSSXewybVqqVVjz8AOxFy9DNPtmu3jlexMz6kUXLV2oB+X6iQeAnHXSzj5Qz/IeDaQ==",
+      "dev": true,
       "peer": true
     },
     "nwsapi": {

package.json

@@ -59,6 +59,6 @@
     "typed-reflector": "^1.0.10"
   },
   "peerDependencies": {
-    "minato": "^1.2.3"
+    "@minatojs/core": "^1.3.0"
   }
 }

src/decorators.ts

 import { ModelClassType, ModelFieldDef } from './def';
 import { Metadata } from './meta/meta';
-import { Flatten, Keys } from 'minato';
+import { Flatten, Keys } from '@minatojs/core';
 import { inferType } from './utils';
 
 export class ModelDecorators<Tables = any> {

src/def/def.ts

-import { Field } from 'minato';
+import { Field } from '@minatojs/core';
 
 type Shorthand<S extends string> = S | `${S}(${any})`;
 

src/meta/def.ts

 import { ModelClassType, ModelFieldDef, PrimaryKeyDef } from '../def';
-import { Keys } from 'minato';
+import { Keys } from '@minatojs/core';
 
 export interface MetadataArrayMap {
   ModelUnique: string | number;

src/register.ts

-import { Database, Field, Flatten, Keys, Model } from 'minato';
+import { Database, Field, Flatten, Keys, Model } from '@minatojs/core';
 import { ModelClassType } from './def';
 import { reflector } from './meta/meta';
 

tests/sample.spec.ts

 import MemoryDriver from '@minatojs/driver-memory';
 import { ModelDecorators } from '../src/decorators';
-import { Database } from 'minato';
+import { Database } from '@minatojs/core';
 import { ModelRegistrar } from '../src/register';
 
 interface Tables {

tests/user-mixin.spec.ts

 import MemoryDriver from '@minatojs/driver-memory';
 import { ModelDecorators } from '../src/decorators';
-import { Database } from 'minato';
+import { Database } from '@minatojs/core';
 import { ModelRegistrar } from '../src/register';
 
 interface User {