@dosgato/api 0.0.64 → 0.0.66

package/dist/assetrule/assetrule.model.js

@@ -10,7 +10,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 import { ValidatedResponse } from '@txstate-mws/graphql-server';
 import { optionalString } from 'txstate-utils';
 import { Field, ID, InputType, ObjectType } from 'type-graphql';
-import { RulePathMode, RuleType } from '../internal.js';
+import { PagetreeType, RulePathMode, RuleType, UrlSafePath } from '../internal.js';
 let AssetRuleGrantsBase = class AssetRuleGrantsBase {
     constructor(row) {
         if (row) {
@@ -77,6 +77,7 @@ let AssetRule = class AssetRule {
         this.id = optionalString(row.id);
         this.roleId = String(row.roleId);
         this.siteId = optionalString(row.siteId);
+        this.pagetreeType = row.pagetreeType;
         this.path = row.path;
         this.mode = row.mode;
         this.grants = new AssetRuleGrants(row);
@@ -102,6 +103,10 @@ __decorate([
     Field({ description: 'Permissions granted by this rule.' }),
     __metadata("design:type", AssetRuleGrants)
 ], AssetRule.prototype, "grants", void 0);
+__decorate([
+    Field(type => PagetreeType, { nullable: true, description: 'The type of pagetree for which this rule applies. Null if it applies to all types' }),
+    __metadata("design:type", String)
+], AssetRule.prototype, "pagetreeType", void 0);
 AssetRule = __decorate([
     ObjectType({ description: 'A rule that grants asset-related privileges. Each role has multiple rules, each rule belonging only to that role.' }),
     __metadata("design:paramtypes", [Object])
@@ -113,6 +118,10 @@ __decorate([
     Field(type => [ID], { nullable: 'itemsAndList', description: 'Include a `null` to return rules that are NOT limited to a site.' }),
     __metadata("design:type", Array)
 ], AssetRuleFilter.prototype, "siteIds", void 0);
+__decorate([
+    Field(type => [PagetreeType], { nullable: 'itemsAndList', description: 'Include a `null` to return rules that are NOT limited to a pagetree type.' }),
+    __metadata("design:type", Array)
+], AssetRuleFilter.prototype, "pagetreeTypes", void 0);
 __decorate([
     Field(type => [ID], { nullable: true }),
     __metadata("design:type", Array)
@@ -148,15 +157,19 @@ export { AssetRuleFilter };
 let CreateAssetRuleInput = class CreateAssetRuleInput {
 };
 __decorate([
-    Field(),
+    Field(type => ID),
     __metadata("design:type", String)
 ], CreateAssetRuleInput.prototype, "roleId", void 0);
 __decorate([
-    Field({ nullable: true }),
+    Field(type => ID, { nullable: true }),
     __metadata("design:type", String)
 ], CreateAssetRuleInput.prototype, "siteId", void 0);
 __decorate([
-    Field({ nullable: true }),
+    Field(type => PagetreeType, { nullable: true }),
+    __metadata("design:type", String)
+], CreateAssetRuleInput.prototype, "pagetreeType", void 0);
+__decorate([
+    Field(type => UrlSafePath, { nullable: true }),
     __metadata("design:type", String)
 ], CreateAssetRuleInput.prototype, "path", void 0);
 __decorate([
@@ -174,15 +187,19 @@ export { CreateAssetRuleInput };
 let UpdateAssetRuleInput = class UpdateAssetRuleInput {
 };
 __decorate([
-    Field(),
+    Field(type => ID),
     __metadata("design:type", String)
 ], UpdateAssetRuleInput.prototype, "ruleId", void 0);
 __decorate([
-    Field({ nullable: true }),
+    Field(type => ID, { nullable: true }),
     __metadata("design:type", String)
 ], UpdateAssetRuleInput.prototype, "siteId", void 0);
 __decorate([
-    Field({ nullable: true }),
+    Field(type => PagetreeType, { nullable: true }),
+    __metadata("design:type", String)
+], UpdateAssetRuleInput.prototype, "pagetreeType", void 0);
+__decorate([
+    Field(type => UrlSafePath, { nullable: true }),
     __metadata("design:type", String)
 ], UpdateAssetRuleInput.prototype, "path", void 0);
 __decorate([

package/dist/assetrule/assetrule.model.js.map

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

package/dist/assetrule/assetrule.service.js

@@ -1,7 +1,7 @@
 import { BaseService, ValidatedResponse, MutationMessageType } from '@txstate-mws/graphql-server';
 import { OneToManyLoader, PrimaryKeyLoader } from 'dataloader-factory';
 import { Cache, filterAsync, isNotNull } from 'txstate-utils';
-import { AssetRule, AssetRuleResponse, comparePathsWithMode, createAssetRule, DosGatoService, getAssetRules, RulePathMode, RoleService, tooPowerfulHelper, updateAssetRule, deleteAssetRule, AssetServiceInternal, AssetFolderServiceInternal, RoleServiceInternal } from '../internal.js';
+import { AssetRule, AssetRuleResponse, comparePathsWithMode, createAssetRule, DosGatoService, getAssetRules, RulePathMode, RoleService, tooPowerfulHelper, updateAssetRule, deleteAssetRule, AssetServiceInternal, AssetFolderServiceInternal, RoleServiceInternal, PagetreeServiceInternal } from '../internal.js';
 const assetRulesByIdLoader = new PrimaryKeyLoader({
     fetch: async (ids) => {
         return await getAssetRules({ ids });
@@ -170,11 +170,16 @@ export class AssetRuleService extends DosGatoService {
         }
     }
     async applies(rule, asset) {
-        const site = await this.svc(AssetServiceInternal).getSite(asset);
-        if (!site)
+        const [site, pagetree] = await Promise.all([
+            this.svc(AssetServiceInternal).getSite(asset),
+            this.svc(AssetServiceInternal).getPagetree(asset)
+        ]);
+        if (!site || !pagetree)
             return false;
         if (rule.siteId && rule.siteId !== site.id)
             return false;
+        if (rule.pagetreeType && rule.pagetreeType !== pagetree.type)
+            return false;
         const assetPath = await this.svc(AssetServiceInternal).getPath(asset);
         if (rule.mode === RulePathMode.SELF && rule.path !== assetPath)
             return false;
@@ -187,7 +192,12 @@ export class AssetRuleService extends DosGatoService {
     async appliesToFolder(rule, folder) {
         if (rule.siteId && rule.siteId !== folder.siteId)
             return false;
-        const folderPath = await this.svc(AssetFolderServiceInternal).getPath(folder);
+        const [folderPath, pagetree] = await Promise.all([
+            this.svc(AssetFolderServiceInternal).getPath(folder),
+            this.svc(PagetreeServiceInternal).findById(folder.pagetreeId)
+        ]);
+        if (rule.pagetreeType && rule.pagetreeType !== pagetree?.type)
+            return false;
         if (rule.mode === RulePathMode.SELF && rule.path !== folderPath)
             return false;
         if (rule.mode === RulePathMode.SELFANDSUB && !folderPath.startsWith(rule.path))
@@ -199,6 +209,8 @@ export class AssetRuleService extends DosGatoService {
     asOrMorePowerful(ruleA, ruleB) {
         if (ruleA.siteId && ruleA.siteId !== ruleB.siteId)
             return false;
+        if (ruleA.pagetreeType && ruleA.pagetreeType !== ruleB.pagetreeType)
+            return false;
         return comparePathsWithMode(ruleA, ruleB);
     }
     async tooPowerful(rule) {

package/dist/assetrule/assetrule.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"assetrule.service.js","sourceRoot":"","sources":["../../src/assetrule/assetrule.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAA;AACjG,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AACtE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAC7D,OAAO,EACE,SAAS,EAAE,iBAAiB,EACnC,oBAAoB,EAAE,eAAe,EAAwB,cAAc,EAC3E,aAAa,EAAE,YAAY,EAAE,WAAW,EAAE,iBAAiB,EAC3D,eAAe,EAAE,eAAe,EAAE,oBAAoB,EAAE,0BAA0B,EAAE,mBAAmB,EACxG,MAAM,gBAAgB,CAAA;AAEvB,MAAM,oBAAoB,GAAG,IAAI,gBAAgB,CAAC;IAChD,KAAK,EAAE,KAAK,EAAE,GAAa,EAAE,EAAE;QAC7B,OAAO,MAAM,aAAa,CAAC,EAAE,GAAG,EAAE,CAAC,CAAA;IACrC,CAAC;CACF,CAAC,CAAA;AAEF,MAAM,sBAAsB,GAAG,IAAI,eAAe,CAAC;IACjD,KAAK,EAAE,KAAK,EAAE,OAAiB,EAAE,MAAwB,EAAE,EAAE;QAC3D,OAAO,MAAM,aAAa,CAAC,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,CAAC,CAAA;IACpD,CAAC;IACD,cAAc,EAAE,CAAC,MAAmC,EAAE,EAAE,CAAC,MAAM,EAAE,OAAO,IAAI,EAAE;IAC9E,UAAU,EAAE,CAAC,CAAY,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM;IACtC,QAAQ,EAAE,oBAAoB;CAC/B,CAAC,CAAA;AAEF,MAAM,sBAAsB,GAAG,IAAI,eAAe,CAAC;IACjD,KAAK,EAAE,KAAK,EAAE,OAAiB,EAAE,EAAE,CAAC,MAAM,aAAa,CAAC,EAAE,OAAO,EAAE,CAAC;IACpE,UAAU,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAO;IAC1B,QAAQ,EAAE,oBAAoB;CAC/B,CAAC,CAAA;AAEF,MAAM,qBAAqB,GAAG,IAAI,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC,MAAM,aAAa,CAAC,EAAE,OAAO,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC,CAAA;AAElH,MAAM,OAAO,wBAAyB,SAAQ,WAAW;IACvD,KAAK,CAAC,QAAQ,CAAE,MAAc;QAC5B,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IAClE,CAAC;IAED,KAAK,CAAC,YAAY,CAAE,MAAc,EAAE,MAAwB;QAC1D,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IAC5E,CAAC;IAED,KAAK,CAAC,YAAY,CAAE,MAAe;QACjC,wFAAwF;QACxF,MAAM,CAAC,SAAS,EAAE,WAAW,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACjD,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE;YACnE,qBAAqB,CAAC,GAAG,EAAE;SAAC,CAC7B,CAAA;QACD,OAAO,CAAC,GAAG,SAAS,EAAE,GAAG,WAAW,CAAC,CAAA;IACvC,CAAC;IAED,KAAK,CAAC,WAAW,CAAE,KAAY;QAC7B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC,gBAAgB,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAA;QAClG,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;QACrD,OAAO,MAAM,WAAW,CAAC,KAAK,EAAE,KAAK,EAAC,CAAC,EAAC,EAAE,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAA;IAChG,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAE,MAAmB;QAC1C,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;QACrD,OAAO,MAAM,WAAW,CAAC,KAAK,EAAE,KAAK,EAAC,CAAC,EAAC,EAAE,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,eAAe,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAA;IACzG,CAAC;CACF;AAED,MAAM,OAAO,gBAAiB,SAAQ,cAAyB;IAA/D;;QACE,QAAG,GAAG,IAAI,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAA;IAsJ1C,CAAC;IApJC,KAAK,CAAC,QAAQ,CAAE,MAAc;QAC5B,OAAO,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAA;IACvE,CAAC;IAED,KAAK,CAAC,YAAY,CAAE,MAAc,EAAE,MAAwB;QAC1D,OAAO,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;IACnF,CAAC;IAED,KAAK,CAAC,YAAY,CAAE,MAAe;QACjC,OAAO,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAA;IAC3E,CAAC;IAED,KAAK,CAAC,WAAW,CAAE,KAAY;QAC7B,OAAO,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAA;IACzE,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAE,MAAmB;QAC1C,OAAO,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAA;IAChF,CAAC;IAED,KAAK,CAAC,MAAM,CAAE,IAA0B,EAAE,YAAsB;QAC9D,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACtE,IAAI,CAAC,IAAI;YAAE,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAA;QACjE,IAAI,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAA;QAC1H,MAAM,OAAO,GAAG,IAAI,SAAS,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,YAAY,CAAC,UAAU,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,CAAA;QACxK,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAClD,MAAM,QAAQ,GAAG,IAAI,iBAAiB,EAAE,CAAA;QACxC,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,CAAY,EAAE,EAAE;YAC9B,IAAI,CAAC,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM;gBAAE,OAAO,KAAK,CAAA;YAC1C,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;gBACd,OAAO,CAAC,CAAC,IAAI,KAAK,GAAG,CAAA;aACtB;;gBAAM,OAAO,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,CAAA;QACpC,CAAC,CAAC,EAAE;YACF,QAAQ,CAAC,UAAU,CAAC,iFAAiF,EAAE,SAAS,EAAE,mBAAmB,CAAC,KAAK,CAAC,CAAA;SAC7I;QACD,IAAI,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE;YACnC,QAAQ,CAAC,UAAU,CAAC,+FAA+F,EAAE,SAAS,EAAE,mBAAmB,CAAC,KAAK,CAAC,CAAA;SAC3J;QACD,IAAI,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YACxB,IAAI,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,IAAI,CAAA;YAC9D,IAAI,IAAI,CAAC,IAAI,KAAK,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBAChD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;aACnC;SACF;QACD,IAAI,QAAQ,CAAC,SAAS,EAAE;YAAE,OAAO,QAAQ,CAAA;QACzC,IAAI,CAAC,YAAY,EAAE;YACjB,IAAI;gBACF,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,IAAI,CAAC,CAAA;gBAC1C,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAA;gBACpB,IAAI,CAAC,OAAO,CAAC,MAAM;oBAAE,MAAM,qBAAqB,CAAC,KAAK,EAAE,CAAA;gBACxD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAA;gBACpD,OAAO,IAAI,iBAAiB,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAA;aACjE;YAAC,OAAO,GAAQ,EAAE;gBACjB,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;gBAClB,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAA;aACtE;SACF;aAAM;YACL,OAAO,IAAI,iBAAiB,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAA;SAChD;IACH,CAAC;IAED,KAAK,CAAC,MAAM,CAAE,IAA0B,EAAE,YAAsB;QAC9D,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACjD,IAAI,CAAC,IAAI;YAAE,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAA;QAChE,IAAI,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAA;QAC3G,MAAM,aAAa,GAAG,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,CAAA;QACxD,IAAI,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YACxB,IAAI,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,IAAI,CAAA;YAC9D,IAAI,IAAI,CAAC,IAAI,KAAK,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBAChD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;aACnC;SACF;QACD,MAAM,OAAO,GAAG,IAAI,SAAS,CAAC;YAC5B,EAAE,EAAE,GAAG;YACP,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,GAAG;YACtB,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,YAAY,CAAC,UAAU;YAC1C,GAAG,aAAa;SACjB,CAAC,CAAA;QACF,MAAM,QAAQ,GAAG,IAAI,iBAAiB,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAA;QACzD,IAAI,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE;YACnC,QAAQ,CAAC,UAAU,CAAC,8FAA8F,CAAC,CAAA;SACpH;QACD,IAAI,QAAQ,CAAC,SAAS,EAAE;YAAE,OAAO,QAAQ,CAAA;QACzC,IAAI,CAAC,YAAY,EAAE;YACjB,MAAM,eAAe,CAAC,IAAI,CAAC,CAAA;YAC3B,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAA;YACpB,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM;gBAAE,MAAM,qBAAqB,CAAC,KAAK,EAAE,CAAA;YACxE,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;YACxD,QAAQ,CAAC,SAAS,GAAG,WAAW,CAAA;SACjC;QACD,OAAO,QAAQ,CAAA;IACjB,CAAC;IAED,KAAK,CAAC,MAAM,CAAE,MAAc;QAC1B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACtE,IAAI,CAAC,IAAI;YAAE,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAA;QAChE,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAA;QAC7G,IAAI;YACF,MAAM,eAAe,CAAC,MAAM,CAAC,CAAA;YAC7B,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAA;YACpB,IAAI,CAAC,IAAI,CAAC,MAAM;gBAAE,MAAM,qBAAqB,CAAC,KAAK,EAAE,CAAA;YACrD,OAAO,IAAI,iBAAiB,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAA;SAChD;QAAC,OAAO,GAAQ,EAAE;YACjB,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAA;SACpE;IACH,CAAC;IAED,KAAK,CAAC,OAAO,CAAE,IAAe,EAAE,KAAY;QAC1C,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QAChE,IAAI,CAAC,IAAI;YAAE,OAAO,KAAK,CAAA;QACvB,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC,EAAE;YAAE,OAAO,KAAK,CAAA;QACxD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;QACrE,IAAI,IAAI,CAAC,IAAI,KAAK,YAAY,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS;YAAE,OAAO,KAAK,CAAA;QAC5E,IAAI,IAAI,CAAC,IAAI,KAAK,YAAY,CAAC,UAAU,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC;YAAE,OAAO,KAAK,CAAA;QAC3F,IAAI,IAAI,CAAC,IAAI,KAAK,YAAY,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAAE,OAAO,KAAK,CAAA;QACjH,OAAO,IAAI,CAAA;IACb,CAAC;IAED,KAAK,CAAC,eAAe,CAAE,IAAe,EAAE,MAAmB;QACzD,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,KAAK,MAAM,CAAC,MAAM;YAAE,OAAO,KAAK,CAAA;QAC9D,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QAC7E,IAAI,IAAI,CAAC,IAAI,KAAK,YAAY,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU;YAAE,OAAO,KAAK,CAAA;QAC7E,IAAI,IAAI,CAAC,IAAI,KAAK,YAAY,CAAC,UAAU,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC;YAAE,OAAO,KAAK,CAAA;QAC5F,IAAI,IAAI,CAAC,IAAI,KAAK,YAAY,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAAE,OAAO,KAAK,CAAA;QACnH,OAAO,IAAI,CAAA;IACb,CAAC;IAED,gBAAgB,CAAE,KAAgB,EAAE,KAAgB;QAClD,IAAI,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM;YAAE,OAAO,KAAK,CAAA;QAC/D,OAAO,oBAAoB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAA;IAC3C,CAAC;IAED,KAAK,CAAC,WAAW,CAAE,IAAe;QAChC,OAAO,iBAAiB,CAAC,IAAI,EAAE,MAAM,IAAI,CAAC,iBAAiB,EAAE,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAA;IACvF,CAAC;IAED,KAAK,CAAC,OAAO,CAAE,IAAe;QAC5B,IAAI,MAAM,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC;YAAE,OAAO,IAAI,CAAA;QAC1D,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACtE,OAAO,CAAC,CAAC,IAAI,CAAA;IACf,CAAC;IAED,KAAK,CAAC,QAAQ,CAAE,IAAe;QAC7B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAC1D,OAAO,MAAM,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,SAAS,CAAC,IAAK,CAAC,CAAA;IACrD,CAAC;CACF"}
+{"version":3,"file":"assetrule.service.js","sourceRoot":"","sources":["../../src/assetrule/assetrule.service.ts"],"names":[],"mappings":"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"}

package/dist/data/data.database.js

@@ -1,84 +1,51 @@
 import db from 'mysql2-async/db';
-import { isNotNull, unique, sortby, eachConcurrent, isNull } from 'txstate-utils';
-import { Data, getDataIndexes, DataFolder, Site, DeleteState, DeletedFilter } from '../internal.js';
+import { isNotNull, unique, sortby } from 'txstate-utils';
+import { Data, getDataIndexes, DataFolder, Site, DeleteState, processDeletedFilters } from '../internal.js';
 import { DateTime } from 'luxon';
-async function getDeleted() {
-    return await db.getvals(`
-    SELECT data.* FROM data
-    LEFT OUTER JOIN sites ON data.siteId = sites.id
-    WHERE data.deleteState = ${DeleteState.DELETED}
-    OR sites.deletedAt IS NOT NULL
-    OR data.folderId IN
-      (SELECT datafolders.id
-      FROM datafolders
-      INNER JOIN sites ON datafolders.siteId = sites.id
-      WHERE sites.deletedAt IS NOT NULL)
-    `);
-}
 async function processFilters(filter) {
-    const where = [];
-    const binds = [];
-    const joins = [];
-    const joined = new Map();
-    if (isNull(filter?.deleted)) {
-        filter = { ...filter, deleted: DeletedFilter.HIDE };
+    const { binds, where, joins } = processDeletedFilters(filter, 'data', new Map([
+        ['templates', 'INNER JOIN templates ON data.templateId = templates.id'],
+        ['sites', 'LEFT JOIN sites ON data.siteId = sites.id']
+    ]), ' AND sites.deletedAt IS NULL AND templates.deleted = 0', ' AND (sites.deletedAt IS NOT NULL OR templates.deleted = 1)');
+    if (filter == null)
+        return { where, binds, joins };
+    if (filter.templateKeys?.length) {
+        joins.set('templates', 'INNER JOIN templates ON templates.id=data.templateId');
+        where.push(`templates.\`key\` IN (${db.in(binds, filter.templateKeys)})`);
     }
-    if (filter?.deleted) {
-        if (filter.deleted === DeletedFilter.ONLY) {
-            // Only show deleted data. It could, itself, be deleted. Or, it might be in a deleted site or a folder in a deleted site.
-            const deletedDataIds = await getDeleted();
-            if (filter?.internalIds?.length) {
-                filter.internalIds = unique([...filter.internalIds, ...deletedDataIds]);
-            }
-            else {
-                filter.internalIds = deletedDataIds;
-            }
-        }
-        else if (filter.deleted === DeletedFilter.HIDE) {
-            // hide fully deleted data
-            const deletedDataIds = await getDeleted();
-            if (deletedDataIds.length) {
-                where.push(`data.id NOT IN (${db.in(binds, deletedDataIds)})`);
-            }
-        }
-        // If deleted is SHOW, we don't need to filter out anything
-    }
-    if (filter?.internalIds?.length) {
+    if (filter.internalIds?.length) {
         where.push(`data.id IN (${db.in(binds, filter.internalIds)})`);
     }
-    if (filter?.ids?.length) {
+    if (filter.ids?.length) {
         where.push(`data.dataId IN (${db.in(binds, filter.ids)})`);
     }
-    if (filter?.names?.length) {
+    if (filter.names?.length) {
         where.push(`data.name IN (${db.in(binds, filter.names)})`);
     }
-    if (isNotNull(filter?.global)) {
-        if (filter?.global) {
+    if (isNotNull(filter.global)) {
+        if (filter.global) {
             where.push('data.siteId IS NULL');
         }
         else {
             where.push('data.siteId IS NOT NULL');
         }
     }
-    if (isNotNull(filter?.root)) {
-        if (filter?.root) {
+    if (isNotNull(filter.root)) {
+        if (filter.root) {
             where.push('data.folderId IS NULL');
         }
         else {
             where.push('data.folderId IS NOT NULL');
         }
     }
-    if (filter?.folderIds?.length) {
+    if (filter.folderIds?.length) {
+        joins.set('datafolders', 'INNER JOIN datafolders on data.folderId = datafolders.id');
         where.push(`datafolders.guid IN (${db.in(binds, filter.folderIds)})`);
-        if (!joined.has('datafolders')) {
-            joins.push('INNER JOIN datafolders on data.folderId = datafolders.id');
-            joined.set('datafolders', true);
-        }
     }
-    if (filter?.folderInternalIds?.length) {
+    if (filter.folderInternalIds?.length) {
         where.push(`data.folderId IN (${(db.in(binds, filter.folderInternalIds))})`);
     }
-    if (filter?.siteIds?.length) {
+    if (filter.siteIds?.length) {
         where.push(`data.siteId IN (${db.in(binds, filter.siteIds)})`);
     }
     return { where, binds, joins };
@@ -86,9 +53,7 @@ async function processFilters(filter) {
 export async function getData(filter) {
     const { where, binds, joins } = await processFilters(filter);
     let query = 'SELECT data.* FROM data';
-    if (joins.length) {
-        query += ` ${joins.join('\n')}`;
-    }
+    query += ` ${Array.from(joins.values()).join('\n')}`;
     if (where.length) {
         query += ` WHERE (${where.join(') AND (')})`;
     }
@@ -214,20 +179,24 @@ async function updateSourceDisplayOrder(db, versionedService, data, templateKey,
 }
 export async function createDataEntry(versionedService, userId, args) {
     return await db.transaction(async (db) => {
-        const dataFolderInternalId = args.folderId ? await db.getval('SELECT id FROM datafolders WHERE guid = ?', [args.folderId]) : undefined;
-        const displayOrder = await handleDisplayOrder(db, versionedService, args.data.templateKey, 1, dataFolderInternalId, args.siteId);
+        const folder = args.folderId ? await db.getrow('SELECT id, siteId FROM datafolders WHERE guid = ?', [args.folderId]) : undefined;
+        const siteId = folder?.siteId ?? args.siteId;
+        const displayOrder = await handleDisplayOrder(db, versionedService, args.data.templateKey, 1, folder?.id, args.siteId);
         const data = args.data;
+        const templateId = await db.getval('SELECT id FROM templates WHERE `key`=?', [data.templateKey]);
+        if (!templateId)
+            throw new Error('templateKey does not exist.');
         const indexes = await getDataIndexes(data);
         const dataId = await versionedService.create('data', data, indexes, userId, db);
-        const columns = ['dataId', 'name', 'displayOrder'];
-        const binds = [dataId, args.name, displayOrder];
-        if (args.siteId) {
+        const columns = ['templateId', 'dataId', 'name', 'displayOrder'];
+        const binds = [templateId, dataId, args.name, displayOrder];
+        if (siteId) {
             columns.push('siteId');
-            binds.push(args.siteId);
+            binds.push(siteId);
         }
-        if (dataFolderInternalId) {
+        if (folder?.id) {
             columns.push('folderId');
-            binds.push(dataFolderInternalId);
+            binds.push(folder?.id);
         }
         const newInternalId = await db.insert(`
     INSERT INTO data (${columns.join(', ')})
@@ -290,7 +259,7 @@ export async function deleteDataEntries(versionedService, data, userInternalId)
     const binds = [userInternalId, DeleteState.MARKEDFORDELETE];
     const dataIds = data.map(d => d.dataId);
     return await db.transaction(async (db) => {
-        await eachConcurrent(dataIds, async (id) => await versionedService.removeTag(id, 'published'));
+        await versionedService.removeTags(dataIds, ['published'], db);
         return await db.update(`UPDATE data SET deletedAt = NOW(), deletedBy = ?, deleteState = ? WHERE dataId IN (${db.in(binds, dataIds)})`, binds);
     });
 }

package/dist/data/data.database.js.map

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

package/dist/data/data.model.d.ts

@@ -1,7 +1,7 @@
+import type { DataData } from '@dosgato/templating';
+import { ValidatedResponse, type ValidatedResponseArgs } from '@txstate-mws/graphql-server';
 import { DateTime } from 'luxon';
-import { ValidatedResponse, ValidatedResponseArgs } from '@txstate-mws/graphql-server';
-import { UrlSafeString, DeletedFilter, DeleteState } from '../internal.js';
-import { DataData } from '@dosgato/templating';
+import { UrlSafeString, DeleteState, DeleteStateInput } from '../internal.js';
 export declare class Data {
     internalId: number;
     id: string;
@@ -14,6 +14,7 @@ export declare class Data {
     folderInternalId?: number;
     siteId?: string;
     displayOrder: number;
+    templateId: number;
     constructor(row: any);
 }
 export declare class DataFilter {
@@ -26,7 +27,7 @@ export declare class DataFilter {
     folderInternalIds?: number[];
     siteIds?: string[];
     templateKeys?: string[];
-    deleted?: DeletedFilter;
+    deleteStates?: DeleteStateInput[];
     paths?: string[];
     links?: DataLinkInput[];
 }

package/dist/data/data.model.js

@@ -7,14 +7,12 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 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 { isNotNull, optionalString } from 'txstate-utils';
 import { ValidatedResponse } from '@txstate-mws/graphql-server';
+import { DateTime } from 'luxon';
+import { optionalString } from 'txstate-utils';
 import { Field, ID, InputType, ObjectType, registerEnumType } from 'type-graphql';
-import { UrlSafeString, JsonData, DeletedFilter, DeleteState, UrlSafePath } from '../internal.js';
+import { UrlSafeString, JsonData, DeleteState, UrlSafePath, DeleteStateInput } from '../internal.js';
 let Data = class Data {
-    // template identifier is NOT a property because it's part of the upgradeable data,
-    // we'll have to use the versionedservice indexing to look up data by template id
     constructor(row) {
         this.internalId = row.id;
         this.id = row.dataId;
@@ -23,10 +21,11 @@ let Data = class Data {
         this.folderInternalId = row.folderId;
         this.displayOrder = row.displayOrder;
         this.siteId = optionalString(row.siteId);
-        this.deleted = isNotNull(row.deletedAt);
-        this.deletedAt = DateTime.fromJSDate(row.deletedAt);
+        this.templateId = row.templateId;
+        this.deleted = row.deleteState !== DeleteState.NOTDELETED;
+        this.deletedAt = row.deletedAt ? DateTime.fromJSDate(row.deletedAt) : undefined;
         this.deletedBy = row.deletedBy;
-        this.deleteState = row.deleteState === 0 ? DeleteState.NOTDELETED : ((row.deleteState === 1 ? DeleteState.MARKEDFORDELETE : DeleteState.DELETED));
+        this.deleteState = row.deleteState;
     }
 };
 __decorate([
@@ -81,9 +80,9 @@ __decorate([
     __metadata("design:type", Array)
 ], DataFilter.prototype, "templateKeys", void 0);
 __decorate([
-    Field(type => DeletedFilter, { nullable: true }),
-    __metadata("design:type", String)
-], DataFilter.prototype, "deleted", void 0);
+    Field(type => [DeleteStateInput], { nullable: true, description: 'Return based on deleted status. If you do not specify this filter it will still hide deleted and orphaned by default but show those that are marked for deletion. Orphaned refers to the situation where an object is effectively deleted because it belongs to a site, pagetree, or parent that has been deleted.' }),
+    __metadata("design:type", Array)
+], DataFilter.prototype, "deleteStates", void 0);
 __decorate([
     Field(type => [UrlSafePath], { nullable: true, description: 'Return data entries with the given paths.' }),
     __metadata("design:type", Array)

package/dist/data/data.model.js.map

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

package/dist/data/data.resolver.js

@@ -14,10 +14,10 @@ import { Context, ValidatedResponse } from '@txstate-mws/graphql-server';
 import { DateTime } from 'luxon';
 import { Resolver, Query, Arg, Ctx, FieldResolver, Root, Int, Mutation, ID } from 'type-graphql';
 import { isNull, unique } from 'txstate-utils';
-import { DataFolder, DataFolderService, Role, JsonData, Site, SiteService, Template, TemplateService, User, UserService, ObjectVersion, VersionedService, Data, DataFilter, DataPermission, DataPermissions, DataService, DataResponse, DataMultResponse, CreateDataInput, UpdateDataInput, DataRuleService, RoleService, MoveDataTarget, UrlSafeString } from '../internal.js';
+import { DataFolder, DataFolderService, Role, JsonData, Site, SiteService, Template, TemplateService, User, UserService, ObjectVersion, VersionedService, Data, DataFilter, DataPermission, DataPermissions, DataService, DataResponse, DataMultResponse, CreateDataInput, UpdateDataInput, DataRuleService, RoleService, MoveDataTarget, UrlSafeString, DeleteStateRootDefault } from '../internal.js';
 let DataResolver = class DataResolver {
     async dataquery(ctx, filter) {
-        return await ctx.svc(DataService).find(filter);
+        return await ctx.svc(DataService).find({ ...filter, deleteStates: filter.deleteStates ?? DeleteStateRootDefault });
     }
     async deletedBy(ctx, data) {
         if (isNull(data.deletedBy))

package/dist/data/data.resolver.js.map

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