@dosgato/api 0.0.126 → 0.0.128

package/dist/role/role.service.js

@@ -1,7 +1,7 @@
 import { BaseService, ValidatedResponse } from '@txstate-mws/graphql-server';
 import { ManyJoinedLoader, OneToManyLoader, PrimaryKeyLoader } from 'dataloader-factory';
 import { intersect, isNotNull, unique } from 'txstate-utils';
-import { DosGatoService, GroupService, UserService, RoleResponse, addRolesToUser, createRole, deleteRole, getRoles, getRolesWithGroup, getRolesWithManager, getRolesForUsers, removeRoleFromUser, updateRole, removeRoleFromGroup, addRoleToGroup, GroupServiceInternal, GlobalRuleServiceInternal, SiteRuleServiceInternal, AssetRuleServiceInternal, DataRuleServiceInternal, PageRuleServiceInternal, TemplateRuleServiceInternal, GlobalRuleService, AssetRuleService, DataRuleService, PageRuleService, SiteRuleService, TemplateRuleService, roleNameIsUnique } from '../internal.js';
+import { DosGatoService, GroupService, UserService, RoleResponse, addRolesToUser, createRole, deleteRole, getRoles, getRolesWithGroup, getRolesWithManager, getRolesForUsers, removeRoleFromUser, updateRole, removeRoleFromGroup, addRoleToGroups, GroupServiceInternal, GlobalRuleServiceInternal, SiteRuleServiceInternal, AssetRuleServiceInternal, DataRuleServiceInternal, PageRuleServiceInternal, TemplateRuleServiceInternal, GlobalRuleService, AssetRuleService, DataRuleService, PageRuleService, SiteRuleService, TemplateRuleService, roleNameIsUnique, assignRoleToUsers } from '../internal.js';
 const rolesByIdLoader = new PrimaryKeyLoader({
     fetch: async (ids) => {
         return await getRoles({ ids });
@@ -185,6 +185,18 @@ export class RoleService extends DosGatoService {
             throw new Error(`An unknown error occurred while trying to assign roles (${roles.map(role => role.name).join(', ')}) to user ${user.id}.`);
         }
     }
+    async assignRoleToUsers(roleId, userIds) {
+        const role = await this.findById(roleId);
+        if (!role)
+            throw new Error('Specified role does not exist.');
+        if (!(await this.mayAssign(role)))
+            throw new Error(`Current user is not permitted to assign role ${role.name} to users.`);
+        const users = (await Promise.all(userIds.map(async (u) => await this.svc(UserService).findById(u)))).filter(isNotNull);
+        if (!users.length)
+            throw new Error('Cannot assign role to user(s)');
+        await assignRoleToUsers(roleId, users.map(u => u.internalId));
+        return new ValidatedResponse({ success: true });
+    }
     async removeRoleFromUser(roleId, userId) {
         const role = await this.findById(roleId);
         if (!role)
@@ -210,22 +222,17 @@ export class RoleService extends DosGatoService {
             throw new Error(`An unknown error occurred while trying to remove role ${role.name} from user ${user.id}.`);
         }
     }
-    async addRoleToGroup(groupId, roleId) {
-        const [role, group] = await Promise.all([this.findById(roleId), this.svc(GroupService).findById(groupId)]);
+    async addRoleToGroups(groupIds, roleId) {
+        const role = await this.findById(roleId);
         if (!role)
-            throw new Error('Role to be updated does not exist.');
-        if (!group)
-            throw new Error('Group to be assigned does not exist.');
+            throw new Error('Specified role does not exist.');
         if (!(await this.mayAssign(role)))
-            throw new Error(`Current user is not permitted to assign role ${role.name} to group ${group.name}.`);
-        try {
-            await addRoleToGroup(groupId, roleId);
-            return new ValidatedResponse({ success: true });
-        }
-        catch (err) {
-            console.error(err);
-            throw new Error(`An unknown error occurred while adding role ${role.name} to group ${group.name}.`);
-        }
+            throw new Error(`Current user is not permitted to assign role ${role.name} to groups.`);
+        const groups = (await Promise.all(groupIds.map(async (g) => await this.svc(GroupService).findById(g)))).filter(isNotNull);
+        if (!groups.length)
+            throw new Error('Cannot assign role to group(s)');
+        await addRoleToGroups(groups.map(g => g.id), roleId);
+        return new ValidatedResponse({ success: true });
     }
     async removeRoleFromGroup(groupId, roleId) {
         const [role, group] = await Promise.all([this.findById(roleId), this.svc(GroupService).findById(groupId)]);

package/dist/role/role.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"role.service.js","sourceRoot":"","sources":["../../src/role/role.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"role.service.js","sourceRoot":"","sources":["../../src/role/role.service.ts"],"names":[],"mappings":"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"}

package/dist/util/zip.d.ts

@@ -1,12 +1,10 @@
 /// <reference types="node" />
 /// <reference types="node" />
-import { Readable, Transform } from 'stream';
-export interface GZipFile {
-    fileName: string;
-    content: Buffer;
-}
-export declare function readTarGz(inputStream: Readable): Readable;
-export declare function tarGzStream(): {
-    input: Readable;
-    output: Transform;
+import { Readable } from 'stream';
+export declare function jsonlGzStream(): {
+    push: (obj: any) => Promise<void>;
+    done: () => void;
+    output: import("zlib").Gzip;
+    error: (e: any) => void;
 };
+export declare function gzipJsonLToJSON(input: Readable): Readable;

package/dist/util/zip.js

@@ -1,46 +1,76 @@
-import { Readable, Transform } from 'stream';
+import { Readable } from 'stream';
 import { pipeline } from 'stream/promises';
-import { extract, pack } from 'tar-stream';
+import { Queue } from 'txstate-utils';
 import { createGunzip, createGzip } from 'zlib';
-export function readTarGz(inputStream) {
+export function jsonlGzStream() {
+    const gzip = createGzip();
+    return {
+        push: async function (obj) {
+            const keepgoing = gzip.write(Buffer.from(JSON.stringify(obj) + '\n', 'utf8'));
+            if (!keepgoing)
+                await new Promise(resolve => gzip.once('drain', resolve));
+        },
+        done: () => {
+            gzip.end();
+        },
+        output: gzip,
+        error: (e) => {
+            gzip.destroy(e);
+        }
+    };
+}
+export function gzipJsonLToJSON(input) {
     const gunzip = createGunzip();
-    const tarExtractor = extract();
     const output = new Readable({ objectMode: true });
-    tarExtractor.on('entry', async (header, stream, next) => {
-        if (header.type !== 'file')
+    const backlog = new Queue();
+    output._read = () => { output.emit('read'); };
+    let buffer = '';
+    gunzip.on('data', (chunk) => {
+        if (output.destroyed)
             return;
-        const bufs = [];
-        for await (const chunk of stream)
-            bufs.push(chunk);
-        const buf = Buffer.concat(bufs);
-        output.push({ fileName: header.name, content: buf });
-        next();
-    });
-    pipeline(inputStream, gunzip, tarExtractor).then(() => output.push(null)).catch(e => output.destroy(e));
-    return output;
-}
-export function tarGzStream() {
-    const output = new Transform({
-        transform(data, encoding, next) {
-            next(undefined, data);
+        buffer += chunk.toString('utf8');
+        const lines = buffer.split('\n');
+        buffer = lines.pop() ?? '';
+        for (const line of lines) {
+            try {
+                if (line.trim().length)
+                    backlog.enqueue(JSON.parse(line));
+            }
+            catch (e) {
+                if (!input.destroyed)
+                    input.destroy(e);
+                output.destroy(e);
+            }
+        }
+        let keepgoing = true;
+        while (backlog.size && keepgoing) {
+            keepgoing = output.push(backlog.dequeue());
+        }
+        if (backlog.size) {
+            gunzip.pause();
+            const onresume = () => {
+                keepgoing = true;
+                while (backlog.size && keepgoing)
+                    keepgoing = output.push(backlog.dequeue());
+                if (backlog.size)
+                    output.once('read', onresume);
+                else
+                    gunzip.resume();
+            };
+            output.once('read', onresume);
         }
     });
-    const gzip = createGzip();
-    gzip.on('error', e => output.destroy(e));
-    const tarPacker = pack();
-    tarPacker.on('error', e => gzip.destroy(e));
-    const input = new Readable({
-        objectMode: true
-    });
-    input._read = () => { };
-    input.on('data', (data) => {
-        tarPacker.entry({ name: data.fileName, type: 'file', size: data.content.length }, data.content);
-    });
-    input.on('error', e => tarPacker.destroy(e));
-    input.on('close', () => {
-        tarPacker.finalize();
+    gunzip.on('end', () => {
+        try {
+            if (buffer.trim().length)
+                output.push(JSON.parse(buffer));
+        }
+        catch (e) {
+            output.destroy(e);
+        }
+        output.push(null);
     });
-    tarPacker.pipe(gzip).pipe(output);
-    return { input, output };
+    pipeline(input, gunzip).catch(e => { output.destroy(e); });
+    return output;
 }
 //# sourceMappingURL=zip.js.map

package/dist/util/zip.js.map

@@ -1 +1 @@
-{"version":3,"file":"zip.js","sourceRoot":"","sources":["../../src/util/zip.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"zip.js","sourceRoot":"","sources":["../../src/util/zip.ts"],"names":[],"mappings":"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"}

package/dist/version/version.model.d.ts

@@ -1,11 +1,23 @@
 import { DateTime } from 'luxon';
 import { Version } from '../internal.js';
+import { ValidatedResponse, type ValidatedResponseArgs } from '@txstate-mws/graphql-server';
 export declare class ObjectVersion {
     version: number;
     date: DateTime;
     comment: string;
     tags: string[];
+    marked: boolean;
+    markedAt?: DateTime;
     id: string;
     userId: string;
     constructor(row: Version);
 }
+export declare class VersionFilter {
+    tags?: string[];
+}
+export declare class VersionResponse extends ValidatedResponse {
+    version?: ObjectVersion;
+    constructor(config?: ValidatedResponseArgs & {
+        version?: ObjectVersion;
+    });
+}

package/dist/version/version.model.js

@@ -8,7 +8,8 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 import { DateTime } from 'luxon';
-import { ObjectType, Field, Int } from 'type-graphql';
+import { ObjectType, Field, Int, InputType } from 'type-graphql';
+import { ValidatedResponse } from '@txstate-mws/graphql-server';
 let ObjectVersion = class ObjectVersion {
     constructor(row) {
         this.id = row.id;
@@ -17,6 +18,8 @@ let ObjectVersion = class ObjectVersion {
         this.comment = row.comment;
         this.tags = row.tags;
         this.userId = row.user;
+        this.marked = !!row.markedAt;
+        this.markedAt = row.markedAt ? DateTime.fromJSDate(row.markedAt) : undefined;
     }
 };
 __decorate([
@@ -35,6 +38,14 @@ __decorate([
     Field(type => [String]),
     __metadata("design:type", Array)
 ], ObjectVersion.prototype, "tags", void 0);
+__decorate([
+    Field(),
+    __metadata("design:type", Boolean)
+], ObjectVersion.prototype, "marked", void 0);
+__decorate([
+    Field({ nullable: true }),
+    __metadata("design:type", DateTime)
+], ObjectVersion.prototype, "markedAt", void 0);
 ObjectVersion = __decorate([
     ObjectType('Version', {
         description: `This is metadata pertaining to a historical version of something versionable
@@ -43,4 +54,29 @@ ObjectVersion = __decorate([
     __metadata("design:paramtypes", [Object])
 ], ObjectVersion);
 export { ObjectVersion };
+let VersionFilter = class VersionFilter {
+};
+__decorate([
+    Field(type => [String], { nullable: true }),
+    __metadata("design:type", Array)
+], VersionFilter.prototype, "tags", void 0);
+VersionFilter = __decorate([
+    InputType()
+], VersionFilter);
+export { VersionFilter };
+let VersionResponse = class VersionResponse extends ValidatedResponse {
+    constructor(config) {
+        super(config ?? {});
+        this.version = config?.version;
+    }
+};
+__decorate([
+    Field({ nullable: true }),
+    __metadata("design:type", ObjectVersion)
+], VersionResponse.prototype, "version", void 0);
+VersionResponse = __decorate([
+    ObjectType(),
+    __metadata("design:paramtypes", [Object])
+], VersionResponse);
+export { VersionResponse };
 //# sourceMappingURL=version.model.js.map

package/dist/version/version.model.js.map

@@ -1 +1 @@
-{"version":3,"file":"version.model.js","sourceRoot":"","sources":["../../src/version/version.model.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAChC,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,cAAc,CAAA;AAGrD,IAIa,aAAa,GAJ1B,MAIa,aAAa;IAgBxB,YAAa,GAAY;QACvB,IAAI,CAAC,EAAE,GAAG,GAAG,CAAC,EAAE,CAAA;QAChB,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC,OAAO,CAAA;QAC1B,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QACzC,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC,OAAO,CAAA;QAC1B,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAA;QACpB,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC,IAAI,CAAA;IACxB,CAAC;CACF,CAAA;AAtBC;IADC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC;;8CACJ;AAGf;IADC,KAAK,EAAE;8BACF,QAAQ;2CAAA;AAGd;IADC,KAAK,EAAE;;8CACO;AAGf;IADC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC;;2CACV;AAXH,aAAa;IAJzB,UAAU,CAAC,SAAS,EAAE;QACrB,WAAW,EAAE;6BACc;KAC5B,CAAC;;GACW,aAAa,CAwBzB;SAxBY,aAAa"}
+{"version":3,"file":"version.model.js","sourceRoot":"","sources":["../../src/version/version.model.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAChC,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAEhE,OAAO,EAAE,iBAAiB,EAA8B,MAAM,6BAA6B,CAAA;AAE3F,IAIa,aAAa,GAJ1B,MAIa,aAAa;IAsBxB,YAAa,GAAY;QACvB,IAAI,CAAC,EAAE,GAAG,GAAG,CAAC,EAAE,CAAA;QAChB,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC,OAAO,CAAA;QAC1B,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QACzC,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC,OAAO,CAAA;QAC1B,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAA;QACpB,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC,IAAI,CAAA;QACtB,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAA;QAC5B,IAAI,CAAC,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IAC9E,CAAC;CACF,CAAA;AA9BC;IADC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC;;8CACJ;AAGf;IADC,KAAK,EAAE;8BACF,QAAQ;2CAAA;AAGd;IADC,KAAK,EAAE;;8CACO;AAGf;IADC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC;;2CACV;AAGd;IADC,KAAK,EAAE;;6CACO;AAGf;IADC,KAAK,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACf,QAAQ;+CAAA;AAjBR,aAAa;IAJzB,UAAU,CAAC,SAAS,EAAE;QACrB,WAAW,EAAE;6BACc;KAC5B,CAAC;;GACW,aAAa,CAgCzB;SAhCY,aAAa;AAmC1B,IAAa,aAAa,GAA1B,MAAa,aAAa;CAGzB,CAAA;AADC;IADC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CAC7B;AAFJ,aAAa;IADzB,SAAS,EAAE;GACC,aAAa,CAGzB;SAHY,aAAa;AAK1B,IACa,eAAe,GAD5B,MACa,eAAgB,SAAQ,iBAAiB;IAIpD,YAAa,MAA4D;QACvE,KAAK,CAAC,MAAM,IAAI,EAAE,CAAC,CAAA;QACnB,IAAI,CAAC,OAAO,GAAG,MAAM,EAAE,OAAO,CAAA;IAChC,CAAC;CACF,CAAA;AANC;IADC,KAAK,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BAChB,aAAa;gDAAA;AAFZ,eAAe;IAD3B,UAAU,EAAE;;GACA,eAAe,CAQ3B;SARY,eAAe"}

package/dist/version/version.resolver.d.ts

@@ -1,6 +1,7 @@
 import { Context } from '@txstate-mws/graphql-server';
-import { User, ObjectVersion } from '../internal.js';
+import { User, ObjectVersion, VersionResponse } from '../internal.js';
 export declare class VersionResolver {
     user(ctx: Context, version: ObjectVersion): Promise<User | import("../internal.js").RedactedUser | undefined>;
     data(ctx: Context, version: ObjectVersion): Promise<any>;
+    versionToggleMarked(ctx: Context, dataId: string, version: number): Promise<VersionResponse>;
 }

package/dist/version/version.resolver.js

@@ -11,8 +11,8 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
 import { Context } from '@txstate-mws/graphql-server';
-import { Ctx, FieldResolver, Resolver, Root } from 'type-graphql';
-import { JsonData, User, UserService, ObjectVersion, VersionedService } from '../internal.js';
+import { Arg, Ctx, FieldResolver, ID, Int, Mutation, Resolver, Root } from 'type-graphql';
+import { JsonData, User, UserService, ObjectVersion, VersionedService, VersionResponse, PageService, PageServiceInternal, AssetServiceInternal, DataServiceInternal, AssetService, DataService } from '../internal.js';
 let VersionResolver = class VersionResolver {
     async user(ctx, version) {
         return await ctx.svc(UserService).findById(version.userId);
@@ -21,6 +21,37 @@ let VersionResolver = class VersionResolver {
         const versioned = await ctx.svc(VersionedService).get(version.id, { version: version.version });
         return versioned.data;
     }
+    async versionToggleMarked(ctx, dataId, version) {
+        const [page, asset, data] = await Promise.all([
+            ctx.svc(PageServiceInternal).findById(dataId),
+            ctx.svc(AssetServiceInternal).findById(dataId),
+            ctx.svc(DataServiceInternal).findById(dataId)
+        ]);
+        if (!page && !asset && !data)
+            throw new Error('Specified dataId could not be found.');
+        if ((page && !await ctx.svc(PageService).mayUpdate(page)) ||
+            (asset && !await ctx.svc(AssetService).mayUpdate(asset)) ||
+            (data && !await ctx.svc(DataService).mayUpdate(data)))
+            throw new Error('You are not allowed to mark or unmark this version.');
+        const vSvc = ctx.svc(VersionedService);
+        await vSvc.toggleMarked(dataId, version);
+        const [versioned, tags] = await Promise.all([
+            vSvc.getMeta(dataId, { version }),
+            vSvc.getTags(dataId, version)
+        ]);
+        if (!versioned)
+            throw new Error('Specified dataId and version combination could not be found.');
+        const versionObj = new ObjectVersion({
+            id: versioned.id,
+            version: versioned.version,
+            date: versioned.modified,
+            comment: versioned.comment,
+            tags: tags.map(t => t.tag),
+            user: versioned.modifiedBy,
+            markedAt: versioned.markedAt
+        });
+        return new VersionResponse({ success: true, version: versionObj });
+    }
 };
 __decorate([
     FieldResolver(returns => User, { description: 'The user whose action created this version.' }),
@@ -38,6 +69,15 @@ __decorate([
     __metadata("design:paramtypes", [Context, ObjectVersion]),
     __metadata("design:returntype", Promise)
 ], VersionResolver.prototype, "data", null);
+__decorate([
+    Mutation(returns => VersionResponse, { description: 'Allows an editor to mark or unmark a version as significant or important. Marking a version does NOT protect it from being deleted by retention policy.' }),
+    __param(0, Ctx()),
+    __param(1, Arg('dataId', type => ID, { description: 'This could be the dataId for anything versionable, i.e. an asset, page, or data entry.' })),
+    __param(2, Arg('version', type => Int)),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Context, String, Number]),
+    __metadata("design:returntype", Promise)
+], VersionResolver.prototype, "versionToggleMarked", null);
 VersionResolver = __decorate([
     Resolver(of => ObjectVersion)
 ], VersionResolver);

package/dist/version/version.resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"version.resolver.js","sourceRoot":"","sources":["../../src/version/version.resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAA;AACrD,OAAO,EAAE,GAAG,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AACjE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AAG7F,IAAa,eAAe,GAA5B,MAAa,eAAe;IAEpB,AAAN,KAAK,CAAC,IAAI,CAAS,GAAY,EAAU,OAAsB;QAC7D,OAAO,MAAM,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;IAC5D,CAAC;IAGK,AAAN,KAAK,CAAC,IAAI,CAAS,GAAY,EAAU,OAAsB;QAC7D,MAAM,SAAS,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAA;QAC/F,OAAO,SAAU,CAAC,IAAI,CAAA;IACxB,CAAC;CACF,CAAA;AATO;IADL,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,WAAW,EAAE,6CAA6C,EAAE,CAAC;IAClF,WAAA,GAAG,EAAE,CAAA;IAAgB,WAAA,IAAI,EAAE,CAAA;;qCAAhB,OAAO,EAAmB,aAAa;;2CAE9D;AAGK;IADL,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,EAAE,WAAW,EAAE,gEAAgE,EAAE,CAAC;IACzG,WAAA,GAAG,EAAE,CAAA;IAAgB,WAAA,IAAI,EAAE,CAAA;;qCAAhB,OAAO,EAAmB,aAAa;;2CAG9D;AAVU,eAAe;IAD3B,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC,aAAa,CAAC;GACjB,eAAe,CAW3B;SAXY,eAAe"}
+{"version":3,"file":"version.resolver.js","sourceRoot":"","sources":["../../src/version/version.resolver.ts"],"names":[],"mappings":"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"}

package/dist/versionedservice/service.d.ts

@@ -1,6 +1,6 @@
 import { BaseService } from '@txstate-mws/graphql-server';
 import { type Queryable } from 'mysql2-async';
-import { type Index, type IndexStringified, type SearchRule, type Tag, type Version, type Versioned, type VersionedCommon } from '../internal.js';
+import { type Index, type IndexStringified, type SearchRule, type Tag, type Versioned, type VersionedCommon, type VersionFilter } from '../internal.js';
 export declare class VersionedService extends BaseService {
     protected static cleaningIndexValues: boolean;
     protected static optimizingTables: boolean;
@@ -127,6 +127,12 @@ export declare class VersionedService extends BaseService {
      * If the object does not have the given tag, returns undefined.
      */
     getTag(id: string, tag: string): Promise<Tag | undefined>;
+    /**
+     * Get a list of tags that apply to the given version
+     *
+     * Does not include 'latest'.
+     */
+    getTags(id: string, version: number): Promise<Tag[]>;
     /**
      * Get the set of tags that apply to the latest version of the given object, not
      * including 'latest'. For instance, if the latest version happens to be tagged as
@@ -149,7 +155,17 @@ export declare class VersionedService extends BaseService {
     /**
      * List old versions of an object so one can be picked for retrieval.
      */
-    listVersions(id: string): Promise<Version[]>;
+    listVersions(id: string, filter?: VersionFilter): Promise<{
+        tags: string[];
+        id: string;
+        version: number;
+        date: Date;
+        user: string;
+        comment: string;
+        markedAt?: Date | undefined;
+        matches: number;
+    }[]>;
+    toggleMarked(id: string, version: number): Promise<void>;
     /**
      * internal method to map a set of index strings to their id in indexvalues table
      * inserts any values that do not already exist

package/dist/versionedservice/service.js

@@ -25,7 +25,7 @@ const metaLoader = new ManyJoinedLoader({
                 if (latests.length) {
                     const binds = [];
                     const latestrows = await db.getall(`
-            SELECT s.id, s.type, s.version, s.created, s.createdBy, s.modified, s.modifiedBy, s.comment
+            SELECT s.id, s.type, s.version, s.created, s.createdBy, s.modified, s.modifiedBy, s.comment, s.markedAt
             FROM storage s
             WHERE s.id IN (${db.in(binds, latests.map(p => p.id))})
           `, binds);
@@ -36,8 +36,8 @@ const metaLoader = new ManyJoinedLoader({
                 if (versions.length) {
                     const binds = [];
                     const versionsrows = await db.getall(`
-            SELECT s.id, s.type, s.version, s.created, s.createdBy, s.modified, s.modifiedBy, s.comment,
-              v.version as selectedVersion, v.date as selectedModified, v.user as selectedModifier, v.comment as selectedComment
+            SELECT s.id, s.type, s.version, s.created, s.createdBy, s.modified, s.modifiedBy, s.comment, s.markedAt,
+              v.version as selectedVersion, v.date as selectedModified, v.user as selectedModifier, v.comment as selectedComment, v.markedAt as selectedMarkedAt
             FROM storage s
             LEFT JOIN versions v ON v.id = s.id
             WHERE
@@ -52,6 +52,7 @@ const metaLoader = new ManyJoinedLoader({
                             version: r.selectedVersion ?? r.version,
                             modified: r.selectedModified ?? r.modified,
                             modifiedBy: r.selectedModifier ?? r.modifiedBy,
+                            markedAt: r.selectedVersion ? r.selectedMarkedAt : r.markedAt,
                             comment: r.selectedVersion != null ? r.selectedComment : r.comment
                         }
                     })));
@@ -75,6 +76,13 @@ const currentTagsLoader = new OneToManyLoader({
     },
     extractKey: tag => tag.id
 });
+const tagsLoader = new OneToManyLoader({
+    fetch: async (pairs) => {
+        const binds = [];
+        return await db.getall(`SELECT t.* FROM tags t WHERE (t.id, t.version) IN (${db.in(binds, pairs.map(p => [p.id, p.version]))})`, binds);
+    },
+    extractKey: tag => ({ id: tag.id, version: tag.version })
+});
 const versionsByNumberLoader = new OneToManyLoader({
     fetch: async (keys) => {
         const binds = [];
@@ -393,9 +401,9 @@ export class VersionedService extends BaseService {
         UPDATE storage SET modified=?, version=?, data=?, modifiedBy=?, comment=? WHERE id=?
       `, [date ?? new Date(), newversion, JSON.stringify(data), user ?? '', comment ?? '', current.id]);
             await db.insert(`
-        INSERT INTO versions (id, version, date, user, comment, \`undo\`)
-        VALUES (?, ?, ?, ?, ?, ?)
-      `, [current.id, current.version, current.modified, current.modifiedBy, current.comment, JSON.stringify(undo)]);
+        INSERT INTO versions (id, version, date, markedAt, user, comment, \`undo\`)
+        VALUES (?, ?, ?, ?, ?, ?, ?)
+      `, [current.id, current.version, current.modified, current.markedAt ?? null, current.modifiedBy, current.comment, JSON.stringify(undo)]);
             await this._setIndexes(current.id, newversion, indexes, db);
             this.loaders.get(storageLoader).clear(id);
         };
@@ -462,6 +470,14 @@ export class VersionedService extends BaseService {
     async getTag(id, tag) {
         return await this.loaders.get(tagLoader).load({ id, tag });
     }
+    /**
+     * Get a list of tags that apply to the given version
+     *
+     * Does not include 'latest'.
+     */
+    async getTags(id, version) {
+        return await this.loaders.get(tagsLoader).load({ id, version });
+    }
     /**
      * Get the set of tags that apply to the latest version of the given object, not
      * including 'latest'. For instance, if the latest version happens to be tagged as
@@ -497,21 +513,25 @@ export class VersionedService extends BaseService {
     /**
      * List old versions of an object so one can be picked for retrieval.
      */
-    async listVersions(id) {
+    async listVersions(id, filter) {
+        let tagClause = '1=1';
+        const binds = [];
+        if (filter?.tags?.length) {
+            tagClause = `t.tag IN (${db.in(binds, filter.tags)})`;
+        }
         const versions = await db.getall(`
-      SELECT v.version, v.date, v.user, v.comment, t.tag
+      SELECT v.id, v.version, v.date, v.user, v.comment, GROUP_CONCAT(t.tag) AS tags, v.markedAt, COUNT(${tagClause}) AS matches
       FROM versions v LEFT JOIN tags t ON t.id=v.id AND t.version=v.version
       WHERE v.id=?
-      ORDER BY v.version DESC
-    `, [id]);
-        const versionMap = new Map();
-        for (const { version, date, user, comment, tag } of versions) {
-            if (!versionMap.has(version))
-                versionMap.set(version, { id, version, date, user, comment, tags: [] });
-            if (tag)
-                versionMap.get(version).tags.push(tag);
-        }
-        return Array.from(versionMap.values());
+      GROUP BY v.id, v.version
+      HAVING matches > 0
+      ORDER BY v.id, v.version DESC
+    `, [...binds, id]);
+        return versions.map(v => ({ ...v, tags: v.tags?.split(',') ?? [] }));
+    }
+    async toggleMarked(id, version) {
+        await db.update('UPDATE storage SET markedAt=IF(markedAt IS NULL, NOW(), NULL) WHERE id=? AND version=?', [id, version]);
+        await db.update('UPDATE versions SET markedAt=IF(markedAt IS NULL, NOW(), NULL) WHERE id=? AND version=?', [id, version]);
     }
     /**
      * internal method to map a set of index strings to their id in indexvalues table