@social-mail/social-mail-web-server 1.4.877 → 1.4.879

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-web-server",
-  "version": "1.4.877",
+  "version": "1.4.879",
   "description": "## Phase 1",
   "main": "index.js",
   "type": "module",
@@ -21,7 +21,7 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.609.0",
     "@azure/storage-blob": "^12.23.0",
-    "@entity-access/entity-access": "^1.0.348",
+    "@entity-access/entity-access": "^1.0.349",
     "@entity-access/server-pages": "^1.1.222",
     "@otplib/preset-v11": "^12.0.1",
     "@social-mail/noto-emoji-svg": "^2.0.42",

package/src/common/Hashtags.ts

@@ -1,6 +1,6 @@
 import { tokenizeRegex } from "../protocols/core/tokenizer.js";
 
-const tags = /(#\p{L}[\p{L}\d\-_\/]+)/gmiu;
+const tags = /((?<=\s)|^)(#\p{L}[\p{L}\d\-_\/]+)/gmiu;
 
 export default class Hashtags {
 

package/src/server/seed/tags/seed-tags.ts

@@ -23,6 +23,7 @@ const addTag = async (c: SocialMailContext, tag: ITagLike) => {
     if (!t) {
         t = c.tags.add({
             name,
+            label: name,
             lowerCaseName,
             contentTypes: contentTypes?.join(",")
         });

package/src/server/services/tags/TagService.ts

@@ -35,12 +35,12 @@ export default class TagService {
         using scope = ServiceProvider.createScope(this);
         const db = scope.resolve(SocialMailContext);
 
-        (db as any).logger = new (class extends ConsoleLogger {
-            debug(a: any): this {
-                console.log(a);
-                return this;
-            }
-        } )();
+        // (db as any).logger = new (class extends ConsoleLogger {
+        //     debug(a: any): this {
+        //         console.log(a);
+        //         return this;
+        //     }
+        // } )();
         const tag = await db.tags.statements.selectOrInsert({
             parentID,
             name,

package/src/tests/core/tags/test-tags.ts

@@ -11,21 +11,28 @@ export default async function() {
 
     const ts = scope.resolve(TagService);
 
+    const db = scope.resolve(SocialMailContext);
+    let all = await db.tags.asQuery().toArray();
+
+    const last = Number(all.pop().tagID) as any;
+
     const tags = await ts.getTagID("A/B/C");
 
     assert.strictEqual(3, tags.length);
 
-    assert.strictEqual(3, tags[2]);
-
-    const db = scope.resolve(SocialMailContext);
-    const all = await db.tags.asQuery().toArray();
+    all = await db.tags.where( { last }, (p) => (x) => x.tagID > p.last ).toArray();
 
-    assert.equal(1, all[0].tagID);
+    assert.equal(last + 1, all[0].tagID);
     assert.equal("a", all[0].name);
 
-    assert.equal(2, all[0].tagID);
-    assert.equal("b", all[0].name);
+    assert.equal(last + 2, all[1].tagID);
+    assert.equal("b", all[1].name);
+
+    assert.equal(last + 3, all[2].tagID);
+    assert.equal("c", all[2].name);
+
+    const tags1 = await ts.getTagID("A/B/C");
+
+    assert.equal(tags.join(","), tags1.join(","));
 
-    assert.equal(3, all[0].tagID);
-    assert.equal("c", all[0].name);
 }

package/src/tests/createTest.ts

@@ -126,6 +126,7 @@ export class testScope {
         const webServer = new WebServer();
 
         const s = await webServer.create(true, false);
+        await globalServices.resolve(WorkflowContext).storage.seed(globalEnv.version);
         webServer.runWorkflows();
 
         globalServices.add(BaseStorage, new VolumeStorage(join(tmpdir(), "sm" + Date.now())));