Do not use model.json (#432)

Signed-off-by: Andrey Sobolev <haiodo@gmail.com>

dev/storage/package.json

@@ -21,6 +21,7 @@
   "dependencies": {
     "@anticrm/core": "~0.6.11",
     "@anticrm/platform": "~0.6.5",
-    "@anticrm/server-core": "~0.6.0"
+    "@anticrm/server-core": "~0.6.0",
+    "@anticrm/model-all": "~0.6.0"
   }
 }

dev/storage/src/storage.ts

@@ -17,7 +17,7 @@ import type { Tx, Ref, Doc, Class, DocumentQuery, FindResult, FindOptions, TxRes
 import { ModelDb, TxDb, Hierarchy } from '@anticrm/core'
 import type { DbAdapter, TxAdapter } from '@anticrm/server-core'
 
-import * as txJson from './model.tx.json'
+import builder from '@anticrm/model-all'
 
 class InMemoryTxAdapter implements TxAdapter {
   private readonly txdb: TxDb
@@ -41,7 +41,7 @@ class InMemoryTxAdapter implements TxAdapter {
   }
 
   async getModel (): Promise<Tx[]> {
-    return txJson as unknown as Tx[]
+    return builder.getTxes()
   }
 }
 

dev/tool/package.json

@@ -36,6 +36,7 @@
     "@anticrm/core":"~0.6.11",
     "@anticrm/contact":"~0.6.2",
     "@anticrm/workspace":"~0.6.0",
-    "minio":"^7.0.19"
+    "minio":"^7.0.19",
+    "@anticrm/model-all":"~0.6.0"
   }
 }

dev/tool/src/workspace.ts

@@ -21,12 +21,12 @@ import { encode } from 'jwt-simple'
 import { BucketItem, Client } from 'minio'
 import contact from '@anticrm/contact'
 
-import * as txJson from './model.tx.json'
+import builder from '@anticrm/model-all'
 import { existsSync } from 'fs'
 import { mkdir, writeFile } from 'fs/promises'
 import { join } from 'path'
 
-const txes = (txJson as any).default as Tx[]
+const txes = builder.getTxes()
 
 /**
  * @public

models/all/src/__genmodel.ts

@@ -14,9 +14,10 @@
 //
 
 import builder from '.'
-import { writeFileSync } from 'fs'
+// import { writeFileSync } from 'fs'
 
 const content = JSON.stringify(builder.getTxes(), undefined, 2)
-writeFileSync('../../dev/storage/src/model.tx.json', content)
-writeFileSync('../../server/workspace/src/model.tx.json', content)
-writeFileSync('../../dev/tool/src/model.tx.json', content)
+console.log(content)
+// writeFileSync('../../dev/storage/src/model.tx.json', content)
+// writeFileSync('../../server/workspace/src/model.tx.json', content)
+// writeFileSync('../../dev/tool/src/model.tx.json', content)

server/workspace/package.json

@@ -31,6 +31,7 @@
     "mongodb": "^4.1.0",
     "@anticrm/contrib": "~0.6.0",
     "jwt-simple": "^0.5.6",
-    "minio": "^7.0.19"
+    "minio": "^7.0.19",
+    "@anticrm/model-all": "~0.6.0"
   }
 }

server/workspace/src/index.ts

@@ -14,15 +14,14 @@
 // limitations under the License.
 //
 
-import { MongoClient, Document } from 'mongodb'
-import core, { DOMAIN_TX, Tx } from '@anticrm/core'
 import { createContributingClient } from '@anticrm/contrib'
+import core, { DOMAIN_TX } from '@anticrm/core'
+import builder from '@anticrm/model-all'
 import { encode } from 'jwt-simple'
 import { Client } from 'minio'
+import { Document, MongoClient } from 'mongodb'
 
-import * as txJson from './model.tx.json'
-
-const txes = (txJson as any).default as Tx[]
+const txes = builder.getTxes()
 
 /**
  * @public