fediverse
/
activity-kit-core
mirror of https://github.com/michaelcpuckett/activity-kit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixup

This commit is contained in:
Michael Puckett 2023-07-22 13:04:25 -04:00
parent 6ebadf02da
commit e6efba7621
19 changed files with 114 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package-lock.json generated
View File

@ -12266,6 +12266,7 @@
"version": "0.4.45",
"license": "MIT",
"dependencies": {
"@activity-kit/type-utilities": "^0.4.46",
"@activity-kit/types": "^0.4.45",
"jsonld": "^8.1.0"
},

3
packages/db-mongo/src/findOne.ts
View File

@ -1,5 +1,6 @@
import { MongoDbAdapter } from '.';
import { AP, DbOptions } from '@activity-kit/types';
import * as AP from '@activity-kit/types';
import { DbOptions } from '@activity-kit/core';
import { convertJsonToEntity } from '@activity-kit/utilities';
import { Db } from 'mongodb';

2
packages/db-mongo/src/index.ts
View File

@ -1,6 +1,6 @@
import { Db } from 'mongodb';
import { DbAdapter } from '@activity-kit/types';
import { DbAdapter } from '@activity-kit/core';
import { findOne } from './findOne';
import { findAll } from './findAll';

2
packages/utilities/lib/applyContext.d.ts vendored
View File

@ -1,2 +1,2 @@
import { AP } from '@activity-kit/types';
import * as AP from '@activity-kit/types';
export declare function applyContext<T>(entity: AP.Entity): T;

32
packages/utilities/lib/applyContext.js
View File

@ -1,11 +1,35 @@
"use strict";
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
if (k2 === undefined) k2 = k;
var desc = Object.getOwnPropertyDescriptor(m, k);
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
desc = { enumerable: true, get: function() { return m[k]; } };
}
Object.defineProperty(o, k2, desc);
}) : (function(o, m, k, k2) {
if (k2 === undefined) k2 = k;
o[k2] = m[k];
}));
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
Object.defineProperty(o, "default", { enumerable: true, value: v });
}) : function(o, v) {
o["default"] = v;
});
var __importStar = (this && this.__importStar) || function (mod) {
if (mod && mod.__esModule) return mod;
var result = {};
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
__setModuleDefault(result, mod);
return result;
};
Object.defineProperty(exports, "__esModule", { value: true });
exports.applyContext = void 0;
const types_1 = require("@activity-kit/types");
const AP = __importStar(require("@activity-kit/types"));
const type_utilities_1 = require("@activity-kit/type-utilities");
const globals_1 = require("./globals");
function applyContext(entity) {
(0, types_1.assertIsApEntity)(entity);
if ((0, types_1.isTypeOf)(entity, types_1.AP.ActorTypes)) {
(0, type_utilities_1.assertIsApEntity)(entity);
if ((0, type_utilities_1.isTypeOf)(entity, AP.ActorTypes)) {
if (!entity['@context']) {
entity['@context'] = [
new URL(globals_1.ACTIVITYSTREAMS_CONTEXT),
@ -19,7 +43,7 @@ function applyContext(entity) {
}
return entity;
}
if ((0, types_1.isTypeOf)(entity, types_1.AP.AllTypes)) {
if ((0, type_utilities_1.isTypeOf)(entity, AP.AllTypes)) {
if (!entity['@context']) {
entity['@context'] = new URL(globals_1.ACTIVITYSTREAMS_CONTEXT);
}

2
packages/utilities/lib/applyContext.js.map
View File

@ -1 +1 @@
{"version":3,"file":"applyContext.js","sourceRoot":"","sources":["../src/applyContext.ts"],"names":[],"mappings":";;;AAAA,+CAAqE;AACrE,uCAA2E;AAE3E,SAAgB,YAAY,CAAI,MAAiB;IAC/C,IAAA,wBAAgB,EAAC,MAAM,CAAC,CAAC;IAEzB,IAAI,IAAA,gBAAQ,EAAe,MAAM,EAAE,UAAE,CAAC,UAAU,CAAC,EAAE;QACjD,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;YACvB,MAAM,CAAC,UAAU,CAAC,GAAG;gBACnB,IAAI,GAAG,CAAC,iCAAuB,CAAC;gBAChC,IAAI,GAAG,CAAC,+BAAqB,CAAC;gBAC9B;oBACE,sBAAsB,EAAE,IAAI,GAAG,CAAC,kCAAkC,CAAC;oBACnE,cAAc,EAAE,IAAI,GAAG,CAAC,0BAA0B,CAAC;oBACnD,aAAa,EAAE,IAAI,GAAG,CAAC,yBAAyB,CAAC;iBAClD;aACF,CAAC;SACH;QAED,OAAO,MAAM,CAAC;KACf;IAED,IAAI,IAAA,gBAAQ,EAAgB,MAAM,EAAE,UAAE,CAAC,QAAQ,CAAC,EAAE;QAChD,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;YACvB,MAAM,CAAC,UAAU,CAAC,GAAG,IAAI,GAAG,CAAC,iCAAuB,CAAC,CAAC;SACvD;QAED,OAAO,MAAM,CAAC;KACf;AACH,CAAC;AA1BD,oCA0BC"}
{"version":3,"file":"applyContext.js","sourceRoot":"","sources":["../src/applyContext.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wDAA0C;AAC1C,iEAA0E;AAC1E,uCAA2E;AAE3E,SAAgB,YAAY,CAAI,MAAiB;IAC/C,IAAA,iCAAgB,EAAC,MAAM,CAAC,CAAC;IAEzB,IAAI,IAAA,yBAAQ,EAAe,MAAM,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE;QACjD,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;YACvB,MAAM,CAAC,UAAU,CAAC,GAAG;gBACnB,IAAI,GAAG,CAAC,iCAAuB,CAAC;gBAChC,IAAI,GAAG,CAAC,+BAAqB,CAAC;gBAC9B;oBACE,sBAAsB,EAAE,IAAI,GAAG,CAAC,kCAAkC,CAAC;oBACnE,cAAc,EAAE,IAAI,GAAG,CAAC,0BAA0B,CAAC;oBACnD,aAAa,EAAE,IAAI,GAAG,CAAC,yBAAyB,CAAC;iBAClD;aACF,CAAC;SACH;QAED,OAAO,MAAM,CAAC;KACf;IAED,IAAI,IAAA,yBAAQ,EAAgB,MAAM,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE;QAChD,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;YACvB,MAAM,CAAC,UAAU,CAAC,GAAG,IAAI,GAAG,CAAC,iCAAuB,CAAC,CAAC;SACvD;QAED,OAAO,MAAM,CAAC;KACf;AACH,CAAC;AA1BD,oCA0BC"}

2
packages/utilities/lib/compressEntity.d.ts vendored
View File

@ -1,2 +1,2 @@
import { AP } from '@activity-kit/types';
import * as AP from '@activity-kit/types';
export declare function compressEntity(entity: AP.Entity): AP.Entity | null;

4
packages/utilities/lib/compressEntity.js
View File

@ -1,7 +1,7 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
exports.compressEntity = void 0;
const types_1 = require("@activity-kit/types");
const type_utilities_1 = require("@activity-kit/type-utilities");
function compressEntity(entity) {
const object = {};
for (const key of Object.keys(entity)) {
@ -11,7 +11,7 @@ function compressEntity(entity) {
}
const compressed = compressObject(object);
try {
(0, types_1.assertIsApEntity)(compressed);
(0, type_utilities_1.assertIsApEntity)(compressed);
return compressed;
}
catch (error) {

2
packages/utilities/lib/compressEntity.js.map
View File

@ -1 +1 @@
{"version":3,"file":"compressEntity.js","sourceRoot":"","sources":["../src/compressEntity.ts"],"names":[],"mappings":";;;AAAA,+CAA2D;AAE3D,SAAgB,cAAc,CAAC,MAAiB;IAC9C,MAAM,MAAM,GAA4B,EAAE,CAAC;IAE3C,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;QACrC,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;YAC3B,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;SAC3B;KACF;IAED,MAAM,UAAU,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;IAE1C,IAAI;QACF,IAAA,wBAAgB,EAAC,UAAU,CAAC,CAAC;QAC7B,OAAO,UAAU,CAAC;KACnB;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,IAAI,CAAC;KACb;AACH,CAAC;AAjBD,wCAiBC;AAED,SAAS,cAAc,CAAC,MAA+B;IACrD,MAAM,UAAU,GAA4B,EAAE,CAAC;IAE/C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;QACjD,UAAU,CAAC,GAAG,CAAC,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC;KACvC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAS,YAAY,CAAC,IAAa;IACjC,IAAI,IAAI,YAAY,GAAG,IAAI,IAAI,YAAY,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;QAC3E,OAAO,IAAI,CAAC;KACb;SAAM,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QAC9B,OAAO,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;KAC/B;SAAM,IAAI,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;QAC3C,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,CAAC,EAAE,YAAY,GAAG,EAAE;YAC1C,OAAO,IAAI,CAAC,EAAE,CAAC;SAChB;aAAM,IAAI,MAAM,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,YAAY,GAAG,EAAE;YACrD,OAAO,IAAI,CAAC,IAAI,CAAC;SAClB;aAAM,IAAI,KAAK,IAAI,IAAI,EAAE;YACxB,IAAI,IAAI,CAAC,GAAG,YAAY,GAAG,EAAE;gBAC3B,OAAO,IAAI,CAAC,GAAG,CAAC;aACjB;iBAAM,IACL,OAAO,IAAI,CAAC,GAAG,KAAK,QAAQ;gBAC5B,MAAM,IAAI,IAAI,CAAC,GAAG;gBAClB,IAAI,CAAC,GAAG,CAAC,IAAI,YAAY,GAAG,EAC5B;gBACA,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC;aACtB;iBAAM;gBACL,OAAO,IAAI,CAAC;aACb;SACF;aAAM;YACL,MAAM,MAAM,GAA4B,EAAE,CAAC;YAE3C,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;gBACzC,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE;oBACjC,MAAM,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC;iBACrC;aACF;YAED,OAAO,cAAc,CAAC,MAAM,CAAC,CAAC;SAC/B;KACF;SAAM;QACL,OAAO,IAAI,CAAC;KACb;AACH,CAAC"}
{"version":3,"file":"compressEntity.js","sourceRoot":"","sources":["../src/compressEntity.ts"],"names":[],"mappings":";;;AACA,iEAAgE;AAEhE,SAAgB,cAAc,CAAC,MAAiB;IAC9C,MAAM,MAAM,GAA4B,EAAE,CAAC;IAE3C,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;QACrC,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;YAC3B,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;SAC3B;KACF;IAED,MAAM,UAAU,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;IAE1C,IAAI;QACF,IAAA,iCAAgB,EAAC,UAAU,CAAC,CAAC;QAC7B,OAAO,UAAU,CAAC;KACnB;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,IAAI,CAAC;KACb;AACH,CAAC;AAjBD,wCAiBC;AAED,SAAS,cAAc,CAAC,MAA+B;IACrD,MAAM,UAAU,GAA4B,EAAE,CAAC;IAE/C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;QACjD,UAAU,CAAC,GAAG,CAAC,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC;KACvC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAS,YAAY,CAAC,IAAa;IACjC,IAAI,IAAI,YAAY,GAAG,IAAI,IAAI,YAAY,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;QAC3E,OAAO,IAAI,CAAC;KACb;SAAM,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QAC9B,OAAO,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;KAC/B;SAAM,IAAI,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;QAC3C,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,CAAC,EAAE,YAAY,GAAG,EAAE;YAC1C,OAAO,IAAI,CAAC,EAAE,CAAC;SAChB;aAAM,IAAI,MAAM,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,YAAY,GAAG,EAAE;YACrD,OAAO,IAAI,CAAC,IAAI,CAAC;SAClB;aAAM,IAAI,KAAK,IAAI,IAAI,EAAE;YACxB,IAAI,IAAI,CAAC,GAAG,YAAY,GAAG,EAAE;gBAC3B,OAAO,IAAI,CAAC,GAAG,CAAC;aACjB;iBAAM,IACL,OAAO,IAAI,CAAC,GAAG,KAAK,QAAQ;gBAC5B,MAAM,IAAI,IAAI,CAAC,GAAG;gBAClB,IAAI,CAAC,GAAG,CAAC,IAAI,YAAY,GAAG,EAC5B;gBACA,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC;aACtB;iBAAM;gBACL,OAAO,IAAI,CAAC;aACb;SACF;aAAM;YACL,MAAM,MAAM,GAA4B,EAAE,CAAC;YAE3C,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;gBACzC,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE;oBACjC,MAAM,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC;iBACrC;aACF;YAED,OAAO,cAAc,CAAC,MAAM,CAAC,CAAC;SAC/B;KACF;SAAM;QACL,OAAO,IAAI,CAAC;KACb;AACH,CAAC"}

2
packages/utilities/lib/convertJsonToEntity.d.ts vendored
View File

@ -1,2 +1,2 @@
import { AP } from '@activity-kit/types';
import * as AP from '@activity-kit/types';
export declare function convertJsonToEntity(object: Record<string, unknown>): AP.Entity | null;

4
packages/utilities/lib/convertJsonToEntity.js
View File

@ -1,12 +1,12 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
exports.convertJsonToEntity = void 0;
const types_1 = require("@activity-kit/types");
const type_utilities_1 = require("@activity-kit/type-utilities");
const globals_1 = require("./globals");
function convertJsonToEntity(object) {
const converted = convertObject(object);
try {
(0, types_1.assertIsApEntity)(converted);
(0, type_utilities_1.assertIsApEntity)(converted);
return converted;
}
catch (error) {

2
packages/utilities/lib/convertJsonToEntity.js.map
View File

@ -1 +1 @@
{"version":3,"file":"convertJsonToEntity.js","sourceRoot":"","sources":["../src/convertJsonToEntity.ts"],"names":[],"mappings":";;;AAAA,+CAA2D;AAC3D,uCAAyC;AAEzC,SAAgB,mBAAmB,CACjC,MAA+B;IAE/B,MAAM,SAAS,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC;IAExC,IAAI;QACF,IAAA,wBAAgB,EAAC,SAAS,CAAC,CAAC;QAC5B,OAAO,SAAS,CAAC;KAClB;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,IAAI,CAAC;KACb;AACH,CAAC;AAXD,kDAWC;AAED,SAAS,aAAa,CAAC,MAA+B;IACpD,MAAM,SAAS,GAA4B,EAAE,CAAC;IAE9C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;QACjD,SAAS,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;KACrC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,WAAW,CAAC,IAAa;IAChC,IAAI,IAAI,YAAY,GAAG,IAAI,IAAI,YAAY,IAAI,EAAE;QAC/C,OAAO,IAAI,CAAC;KACb;SAAM,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;QACnC,IAAI,IAAI,KAAK,WAAW,EAAE;YACxB,OAAO,IAAI,GAAG,CAAC,sBAAY,CAAC,CAAC;SAC9B;QAED,IAAI;YACF,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;gBAC3B,OAAO,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC;aACtB;iBAAM;gBACL,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAE9B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;oBACvB,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC;iBACvB;gBAED,OAAO,IAAI,CAAC;aACb;SACF;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,IAAI,CAAC;SACb;KACF;SAAM,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QAC9B,OAAO,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;KAC9B;SAAM,IAAI,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;QAC3C,MAAM,MAAM,GAA4B,EAAE,CAAC;QAE3C,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YACzC,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE;gBACjC,MAAM,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC;aACrC;SACF;QAED,OAAO,aAAa,CAAC,MAAM,CAAC,CAAC;KAC9B;SAAM;QACL,OAAO,IAAI,CAAC;KACb;AACH,CAAC"}
{"version":3,"file":"convertJsonToEntity.js","sourceRoot":"","sources":["../src/convertJsonToEntity.ts"],"names":[],"mappings":";;;AACA,iEAAgE;AAChE,uCAAyC;AAEzC,SAAgB,mBAAmB,CACjC,MAA+B;IAE/B,MAAM,SAAS,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC;IAExC,IAAI;QACF,IAAA,iCAAgB,EAAC,SAAS,CAAC,CAAC;QAC5B,OAAO,SAAS,CAAC;KAClB;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,IAAI,CAAC;KACb;AACH,CAAC;AAXD,kDAWC;AAED,SAAS,aAAa,CAAC,MAA+B;IACpD,MAAM,SAAS,GAA4B,EAAE,CAAC;IAE9C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;QACjD,SAAS,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;KACrC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,WAAW,CAAC,IAAa;IAChC,IAAI,IAAI,YAAY,GAAG,IAAI,IAAI,YAAY,IAAI,EAAE;QAC/C,OAAO,IAAI,CAAC;KACb;SAAM,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;QACnC,IAAI,IAAI,KAAK,WAAW,EAAE;YACxB,OAAO,IAAI,GAAG,CAAC,sBAAY,CAAC,CAAC;SAC9B;QAED,IAAI;YACF,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;gBAC3B,OAAO,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC;aACtB;iBAAM;gBACL,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAE9B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;oBACvB,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC;iBACvB;gBAED,OAAO,IAAI,CAAC;aACb;SACF;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,IAAI,CAAC;SACb;KACF;SAAM,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QAC9B,OAAO,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;KAC9B;SAAM,IAAI,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;QAC3C,MAAM,MAAM,GAA4B,EAAE,CAAC;QAE3C,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YACzC,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE;gBACjC,MAAM,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC;aACrC;SACF;QAED,OAAO,aAAa,CAAC,MAAM,CAAC,CAAC;KAC9B;SAAM;QACL,OAAO,IAAI,CAAC;KACb;AACH,CAAC"}

65
packages/utilities/lib/globals.d.ts vendored
View File

@ -1,4 +1,3 @@
import { Routes } from '@activity-kit/types';
export declare const PORT: number;
export declare const LOCAL_HOSTNAME: string;
export declare const PROTOCOL: string;
@ -24,5 +23,67 @@ export declare const JRD_CONTENT_TYPE = "application/jrd+json";
export declare const JSON_CONTENT_TYPE = "application/json";
export declare const HTML_CONTENT_TYPE = "text/html";
export declare const USERNAME_REGEXP: RegExp;
export declare const DEFAULT_ROUTES: Routes;
export declare const DEFAULT_ROUTES: {
serverActor: string;
serverInbox: string;
serverOutbox: string;
serverFollowers: string;
serverFollowing: string;
serverHashtags: string;
person: string;
group: string;
application: string;
service: string;
organization: string;
article: string;
event: string;
note: string;
page: string;
place: string;
relationship: string;
profile: string;
video: string;
document: string;
audio: string;
image: string;
hashtag: string;
accept: string;
follow: string;
delete: string;
create: string;
arrive: string;
add: string;
offer: string;
like: string;
leave: string;
ignore: string;
join: string;
reject: string;
invite: string;
tentativeReject: string;
tentativeAccept: string;
view: string;
update: string;
undo: string;
remove: string;
read: string;
listen: string;
move: string;
travel: string;
announce: string;
block: string;
flag: string;
dislike: string;
question: string;
inbox: string;
outbox: string;
followers: string;
following: string;
liked: string;
stream: string;
endpoint: string;
likes: string;
shares: string;
replies: string;
};
export declare const RESERVED_USERNAMES: string[];

2
packages/utilities/lib/globals.js.map
View File

@ -1 +1 @@
{"version":3,"file":"globals.js","sourceRoot":"","sources":["../src/globals.ts"],"names":[],"mappings":"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"}
{"version":3,"file":"globals.js","sourceRoot":"","sources":["../src/globals.ts"],"names":[],"mappings":";;;AAAa,QAAA,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,IAAI,CAAC,CAAC;AAC3C,QAAA,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,WAAW,CAAC;AACzD,QAAA,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,OAAO,CAAC;AAC9C,QAAA,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,IAAI,aAAa,CAAC;AAClD,QAAA,YAAY,GAAG,GAAG,gBAAQ,KAAK,sBAAc,GACxD,YAAI,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,YAAI,EAC7B,EAAE,CAAC;AACU,QAAA,WAAW,GAAG,UAAU,CAAC;AACzB,QAAA,uBAAuB,GAAG,uCAAuC,CAAC;AAClE,QAAA,qBAAqB,GAAG,8BAA8B,CAAC;AACvD,QAAA,kBAAkB,GAAG,qBAAqB,CAAC;AAC3C,QAAA,WAAW,GAAG,2BAA2B,CAAC;AAC1C,QAAA,oBAAoB,GAAG,qCAAqC,CAAC;AAC7D,QAAA,iBAAiB,GAAG,yCAAyC,CAAC;AAC9D,QAAA,YAAY,GAAG,GAAG,+BAAuB,QAAQ,CAAC;AAClD,QAAA,wBAAwB,GAAG,qBAAqB,CAAC;AACjD,QAAA,qBAAqB,GAAG,KAAK,CAAC;AAC9B,QAAA,eAAe,GAAG,GAAG,oBAAY,cAAc,CAAC;AAChD,QAAA,aAAa,GAAG,QAAQ,CAAC;AACzB,QAAA,mBAAmB,GAAG,cAAc,CAAC;AACrC,QAAA,yCAAyC,GAAG,GAAG,gCAAwB,cAAc,+BAAuB,GAAG,CAAC;AAChH,QAAA,4BAA4B,GAAG,2BAA2B,CAAC;AAC3D,QAAA,gBAAgB,GAAG,qBAAqB,CAAC;AACzC,QAAA,gBAAgB,GAAG,sBAAsB,CAAC;AAC1C,QAAA,iBAAiB,GAAG,kBAAkB,CAAC;AACvC,QAAA,iBAAiB,GAAG,WAAW,CAAC;AAChC,QAAA,eAAe,GAAG,gBAAgB,CAAC;AACnC,QAAA,cAAc,GAAG;IAE5B,WAAW,EAAE,YAAY;IACzB,WAAW,EAAE,yBAAyB;IACtC,YAAY,EAAE,0BAA0B;IACxC,eAAe,EAAE,6BAA6B;IAC9C,eAAe,EAAE,6BAA6B;IAC9C,cAAc,EAAE,MAAM;IAGtB,MAAM,EAAE,aAAa;IACrB,KAAK,EAAE,kBAAkB;IACzB,WAAW,EAAE,wBAAwB;IACrC,OAAO,EAAE,oBAAoB;IAC7B,YAAY,EAAE,yBAAyB;IAGvC,OAAO,EAAE,gBAAgB;IACzB,KAAK,EAAE,cAAc;IACrB,IAAI,EAAE,aAAa;IACnB,IAAI,EAAE,gBAAgB;IACtB,KAAK,EAAE,cAAc;IACrB,YAAY,EAAE,qBAAqB;IACnC,OAAO,EAAE,gBAAgB;IACzB,KAAK,EAAE,cAAc;IACrB,QAAQ,EAAE,iBAAiB;IAC3B,KAAK,EAAE,cAAc;IACrB,KAAK,EAAE,cAAc;IACrB,OAAO,EAAE,YAAY;IAGrB,MAAM,EAAE,eAAe;IACvB,MAAM,EAAE,eAAe;IACvB,MAAM,EAAE,eAAe;IACvB,MAAM,EAAE,eAAe;IACvB,MAAM,EAAE,eAAe;IACvB,GAAG,EAAE,YAAY;IACjB,KAAK,EAAE,cAAc;IACrB,IAAI,EAAE,aAAa;IACnB,KAAK,EAAE,cAAc;IACrB,MAAM,EAAE,eAAe;IACvB,IAAI,EAAE,aAAa;IACnB,MAAM,EAAE,eAAe;IACvB,MAAM,EAAE,eAAe;IACvB,eAAe,EAAE,yBAAyB;IAC1C,eAAe,EAAE,yBAAyB;IAC1C,IAAI,EAAE,aAAa;IACnB,MAAM,EAAE,eAAe;IACvB,IAAI,EAAE,aAAa;IACnB,MAAM,EAAE,eAAe;IACvB,IAAI,EAAE,aAAa;IACnB,MAAM,EAAE,eAAe;IACvB,IAAI,EAAE,aAAa;IACnB,MAAM,EAAE,eAAe;IACvB,QAAQ,EAAE,iBAAiB;IAC3B,KAAK,EAAE,cAAc;IACrB,IAAI,EAAE,aAAa;IACnB,OAAO,EAAE,gBAAgB;IACzB,QAAQ,EAAE,iBAAiB;IAG3B,KAAK,EAAE,yBAAyB;IAChC,MAAM,EAAE,0BAA0B;IAClC,SAAS,EAAE,6BAA6B;IACxC,SAAS,EAAE,6BAA6B;IACxC,KAAK,EAAE,yBAAyB;IAChC,MAAM,EAAE,gCAAgC;IACxC,QAAQ,EAAE,kCAAkC;IAG5C,KAAK,EAAE,yBAAyB;IAChC,MAAM,EAAE,0BAA0B;IAClC,OAAO,EAAE,2BAA2B;CACrC,CAAC;AACW,QAAA,kBAAkB,GAAG;IAChC,6BAAqB;IACrB,GAAG,MAAM,CAAC,IAAI,CAAC,sBAAc,CAAC;IAC9B,KAAK;IACL,MAAM;IACN,MAAM;IACN,OAAO;IACP,SAAS;IACT,UAAU;IACV,OAAO;IACP,YAAY;IACZ,QAAQ;IACR,aAAa;IACb,cAAc;IACd,cAAc;IACd,QAAQ;IACR,KAAK;IACL,OAAO;IACP,KAAK;IACL,WAAW;IACX,MAAM;IACN,UAAU;IACV,MAAM;IACN,OAAO;CACR,CAAC"}

1
packages/utilities/package.json
View File

@ -28,6 +28,7 @@
"url": "https://github.com/michaelcpuckett/activitypub-core/issues"
},
"dependencies": {
"@activity-kit/type-utilities": "^0.4.46",
"@activity-kit/types": "^0.4.45",
"jsonld": "^8.1.0"
},

3
packages/utilities/src/applyContext.ts
View File

@ -1,4 +1,5 @@
import { AP, assertIsApEntity, isTypeOf } from '@activity-kit/types';
import * as AP from '@activity-kit/types';
import { assertIsApEntity, isTypeOf } from '@activity-kit/type-utilities';
import { ACTIVITYSTREAMS_CONTEXT, W3ID_SECURITY_CONTEXT } from './globals';
export function applyContext<T>(entity: AP.Entity): T {

3
packages/utilities/src/compressEntity.ts
View File

@ -1,4 +1,5 @@
import { AP, assertIsApEntity } from '@activity-kit/types';
import * as AP from '@activity-kit/types';
import { assertIsApEntity } from '@activity-kit/type-utilities';
export function compressEntity(entity: AP.Entity): AP.Entity | null {
const object: Record<string, unknown> = {};

3
packages/utilities/src/convertJsonToEntity.ts
View File

@ -1,4 +1,5 @@
import { AP, assertIsApEntity } from '@activity-kit/types';
import * as AP from '@activity-kit/types';
import { assertIsApEntity } from '@activity-kit/type-utilities';
import { PUBLIC_ACTOR } from './globals';
export function convertJsonToEntity(

4
packages/utilities/src/globals.ts
View File

@ -1,5 +1,3 @@
import { Routes } from '@activity-kit/types';
export const PORT = Number(process.env.AP_PORT ?? 3000);
export const LOCAL_HOSTNAME = process.env.AP_HOST_NAME ?? 'localhost';
export const PROTOCOL = process.env.AP_PROTOCOL ?? 'http:';
@ -27,7 +25,7 @@ export const JRD_CONTENT_TYPE = 'application/jrd+json';
export const JSON_CONTENT_TYPE = 'application/json';
export const HTML_CONTENT_TYPE = 'text/html';
export const USERNAME_REGEXP = /^[\w\d]{3,12}$/;
export const DEFAULT_ROUTES: Routes = {
export const DEFAULT_ROUTES = {
// Server Actor.
serverActor: '/:username',
serverInbox: '(.+)?:entityRoute/inbox',