solid-logic 3.0.9-e0e79662 → 3.0.9-e368b0b

package/package.json

@@ -1,18 +1,40 @@
 {
   "name": "solid-logic",
-  "version": "3.0.9-e0e79662",
-  "description": "Core business logic of Solid OS",
-  "main": "lib/index.js",
+  "type": "module",
+  "version": "3.0.9-e368b0b",
+  "description": "Core business logic of SolidOS",
+  "main": "dist/solid-logic.umd.js",
+  "module": "dist/solid-logic.esm.js",
+  "types": "dist/index.d.ts",
+  "exports": {
+    ".": {
+      "import": "./dist/solid-logic.esm.js",
+      "require": "./dist/solid-logic.umd.js"
+    }
+  },
+  "sideEffects": false,
+  "files": [
+    "dist/",
+    "README.md",
+    "LICENSE"
+  ],
   "scripts": {
-    "build": "npm run clean && tsc",
-    "clean": "rm -rf lib",
-    "lint": "eslint ./src",
-    "test": "jest",
+    "clean": "rm -rf dist src/versionInfo.ts",
+    "build": "npm run clean && npm run build-version && npm run build-js && npm run build-dist && npm run postbuild-js",
+    "build-version": "./timestamp.sh > src/versionInfo.ts  && eslint 'src/versionInfo.ts' --fix",
+    "build-js": "tsc",
+    "postbuild-js": "rm -f dist/versionInfo.d.ts dist/versionInfo.d.ts.map",
+    "build-dist": "webpack --progress",
+    "lint": "eslint",
+    "typecheck": "tsc --noEmit",
+    "typecheck-test": "tsc --noEmit -p tsconfig.test.json",
+    "test": "jest --no-coverage",
+    "test-coverage": "jest --coverage",
     "test-debug": "node --inspect-brk ./node_modules/.bin/jest -i --env jest-environment-node-debug",
-    "preversion": "npm test",
-    "postversion": "git push --follow-tags",
     "ignore:prepublishOnly": "npm run build && npm run test",
-    "watch": "tsc --watch"
+    "preversion": "npm run lint && npm run typecheck && npm test",
+    "postversion": "git push origin main --follow-tags",
+    "watch": "npm run build-version && tsc --watch"
   },
   "repository": {
     "type": "git",
@@ -25,26 +47,45 @@
   },
   "homepage": "https://github.com/solidos/solid-logic#readme",
   "devDependencies": {
-    "@babel/plugin-transform-class-properties": "^7.27.1",
-    "@babel/plugin-transform-optional-chaining": "^7.27.1",
-    "@babel/plugin-transform-async-to-generator": "^7.27.1",
-    "@babel/plugin-transform-runtime": "^7.28.0",
-    "@babel/preset-env": "^7.28.0",
+    "@babel/core": "^7.28.4",
+    "@babel/preset-env": "^7.28.3",
     "@babel/preset-typescript": "^7.27.1",
     "@types/jest": "^30.0.0",
     "@typescript-eslint/eslint-plugin": "^8.34.0",
     "@typescript-eslint/parser": "^8.34.0",
+    "babel-jest": "^30.1.2",
+    "babel-loader": "^10.0.0",
     "eslint": "^9.28.0",
+    "eslint-config-prettier": "^10.1.8",
+    "eslint-plugin-import": "^2.32.0",
+    "husky": "^9.1.7",
     "jest": "^30.0.2",
     "jest-environment-jsdom": "^30.0.2",
     "jest-environment-node-debug": "^2.0.0",
     "jest-fetch-mock": "^3.0.3",
-    "typescript": "^5.7.3"
+    "lint-staged": "^16.1.5",
+    "terser-webpack-plugin": "^5.3.14",
+    "ts-loader": "^9.5.4",
+    "tslib": "^2.8.1",
+    "typescript": "^5.9.2",
+    "typescript-eslint": "^8.42.0",
+    "webpack": "^5.101.3",
+    "webpack-cli": "^6.0.1",
+    "webpack-node-externals": "^3.0.0"
   },
   "dependencies": {
-    "@inrupt/solid-client-authn-browser": "1.17",
+    "@inrupt/solid-client-authn-browser": "^3.1.0",
     "lint-staged": "^16.1.5",
     "rdflib": "^2.2.37",
     "solid-namespace": "^0.5.4"
+  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged",
+      "pre-push": "npm test"
+    }
+  },
+  "lint-staged": {
+    "*.ts": "eslint --fix"
   }
 }

package/eslint.config.js

@@ -1,29 +0,0 @@
-const {
-    defineConfig,
-} = require("eslint/config");
-
-const tsParser = require("@typescript-eslint/parser");
-const typescriptEslint = require("@typescript-eslint/eslint-plugin");
-const js = require("@eslint/js");
-
-const {
-    FlatCompat,
-} = require("@eslint/eslintrc");
-
-const compat = new FlatCompat({
-    baseDirectory: __dirname,
-    recommendedConfig: js.configs.recommended,
-    allConfig: js.configs.all
-});
-
-module.exports = defineConfig([{
-    languageOptions: {
-        parser: tsParser,
-    },
-
-    plugins: {
-        "@typescript-eslint": typescriptEslint,
-    },
-
-    extends: compat.extends("eslint:recommended", "plugin:@typescript-eslint/recommended"),
-}]);

package/jest.config.js

@@ -1,10 +0,0 @@
-module.exports = {
-  verbose: true,
-  testEnvironment: 'jsdom',
-  testEnvironmentOptions: {
-      customExportConditions: ['node']
-  },
-  setupFilesAfterEnv: [
-    './test/helpers/setup.ts'
-  ]
-}

package/lib/acl/aclLogic.d.ts

@@ -1,5 +0,0 @@
-import { NamedNode } from "rdflib";
-import { AclLogic } from "../types";
-export declare const ACL_LINK: NamedNode;
-export declare function createAclLogic(store: any): AclLogic;
-//# sourceMappingURL=aclLogic.d.ts.map

package/lib/acl/aclLogic.js

@@ -1,168 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
-    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ACL_LINK = void 0;
-exports.createAclLogic = createAclLogic;
-var rdflib_1 = require("rdflib");
-var ns_1 = require("../util/ns");
-exports.ACL_LINK = (0, rdflib_1.sym)("http://www.iana.org/assignments/link-relations/acl");
-function createAclLogic(store) {
-    var ns = ns_1.ns;
-    function findAclDocUrl(url) {
-        return __awaiter(this, void 0, void 0, function () {
-            var docNode;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, store.fetcher.load(url)];
-                    case 1:
-                        _a.sent();
-                        docNode = store.any(url, exports.ACL_LINK);
-                        if (!docNode) {
-                            throw new Error("No ACL link discovered for ".concat(url));
-                        }
-                        return [2 /*return*/, docNode.value];
-                }
-            });
-        });
-    }
-    /**
-     * Simple Access Control
-     *
-     * This function sets up a simple default ACL for a resource, with
-     * RWC for the owner, and a specified access (default none) for the public.
-     * In all cases owner has read write control.
-     * Parameter lists modes allowed to public
-     *
-     * @param options
-     * @param options.public eg ['Read', 'Write']
-     *
-     * @returns Resolves with aclDoc uri on successful write
-     */
-    function setACLUserPublic(docURI, me, options) {
-        var aclDoc = store.any(store.sym(docURI), exports.ACL_LINK);
-        return Promise.resolve()
-            .then(function () {
-            if (aclDoc) {
-                return aclDoc;
-            }
-            return fetchACLRel(docURI).catch(function (err) {
-                throw new Error("Error fetching rel=ACL header for ".concat(docURI, ": ").concat(err));
-            });
-        })
-            .then(function (aclDoc) {
-            var aclText = genACLText(docURI, me, aclDoc.uri, options);
-            if (!store.fetcher) {
-                throw new Error('Cannot PUT this, store has no fetcher');
-            }
-            return store.fetcher
-                .webOperation('PUT', aclDoc.uri, {
-                data: aclText,
-                contentType: 'text/turtle'
-            })
-                .then(function (result) {
-                if (!result.ok) {
-                    throw new Error('Error writing ACL text: ' + result.error);
-                }
-                return aclDoc;
-            });
-        });
-    }
-    /**
-     * @param docURI
-     * @returns
-     */
-    function fetchACLRel(docURI) {
-        var fetcher = store.fetcher;
-        if (!fetcher) {
-            throw new Error('Cannot fetch ACL rel, store has no fetcher');
-        }
-        return fetcher.load(docURI).then(function (result) {
-            if (!result.ok) {
-                // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                throw new Error('fetchACLRel: While loading:' + result.error);
-            }
-            var aclDoc = store.any(store.sym(docURI), exports.ACL_LINK);
-            if (!aclDoc) {
-                throw new Error('fetchACLRel: No Link rel=ACL header for ' + docURI);
-            }
-            return aclDoc;
-        });
-    }
-    /**
-     * @param docURI
-     * @param me
-     * @param aclURI
-     * @param options
-     *
-     * @returns Serialized ACL
-     */
-    function genACLText(docURI, me, aclURI, options) {
-        if (options === void 0) { options = {}; }
-        var optPublic = options.public || [];
-        var g = (0, rdflib_1.graph)();
-        var auth = (0, rdflib_1.Namespace)('http://www.w3.org/ns/auth/acl#');
-        var a = g.sym("".concat(aclURI, "#a1"));
-        var acl = g.sym(aclURI);
-        var doc = g.sym(docURI);
-        g.add(a, ns.rdf('type'), auth('Authorization'), acl);
-        g.add(a, auth('accessTo'), doc, acl);
-        if (options.defaultForNew) {
-            g.add(a, auth('default'), doc, acl);
-        }
-        g.add(a, auth('agent'), me, acl);
-        g.add(a, auth('mode'), auth('Read'), acl);
-        g.add(a, auth('mode'), auth('Write'), acl);
-        g.add(a, auth('mode'), auth('Control'), acl);
-        if (optPublic.length) {
-            a = g.sym("".concat(aclURI, "#a2"));
-            g.add(a, ns.rdf('type'), auth('Authorization'), acl);
-            g.add(a, auth('accessTo'), doc, acl);
-            g.add(a, auth('agentClass'), ns.foaf('Agent'), acl);
-            for (var p = 0; p < optPublic.length; p++) {
-                g.add(a, auth('mode'), auth(optPublic[p]), acl); // Like 'Read' etc
-            }
-        }
-        return (0, rdflib_1.serialize)(acl, g, aclURI);
-    }
-    return {
-        findAclDocUrl: findAclDocUrl,
-        setACLUserPublic: setACLUserPublic,
-        genACLText: genACLText
-    };
-}
-//# sourceMappingURL=aclLogic.js.map

package/lib/acl/aclLogic.js.map

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

package/lib/authSession/authSession.js

@@ -1,8 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.authSession = void 0;
-var solid_client_authn_browser_1 = require("@inrupt/solid-client-authn-browser");
-exports.authSession = new solid_client_authn_browser_1.Session({
-    clientAuthentication: (0, solid_client_authn_browser_1.getClientAuthenticationWithDependencies)({})
-}, 'mySession');
-//# sourceMappingURL=authSession.js.map

package/lib/authSession/authSession.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"authSession.js","sourceRoot":"","sources":["../../src/authSession/authSession.ts"],"names":[],"mappings":";;;AAAA,iFAG2C;AAE9B,QAAA,WAAW,GAAG,IAAI,oCAAO,CAClC;IACE,oBAAoB,EAAE,IAAA,oEAAuC,EAAC,EAAE,CAAC;CAClE,EACD,WAAW,CACZ,CAAA"}

package/lib/authn/SolidAuthnLogic.js

@@ -1,191 +0,0 @@
-"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 () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
-    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SolidAuthnLogic = void 0;
-var rdflib_1 = require("rdflib");
-var authUtil_1 = require("./authUtil");
-var debug = __importStar(require("../util/debug"));
-var SolidAuthnLogic = /** @class */ (function () {
-    function SolidAuthnLogic(solidAuthSession) {
-        this.session = solidAuthSession;
-    }
-    Object.defineProperty(SolidAuthnLogic.prototype, "authSession", {
-        // we created authSession getter because we want to access it as authn.authSession externally
-        get: function () { return this.session; },
-        enumerable: false,
-        configurable: true
-    });
-    SolidAuthnLogic.prototype.currentUser = function () {
-        var app = (0, authUtil_1.appContext)();
-        if (app.viewingNoAuthPage) {
-            return (0, rdflib_1.sym)(app.webId);
-        }
-        if (this && this.session && this.session.info && this.session.info.webId && this.session.info.isLoggedIn) {
-            return (0, rdflib_1.sym)(this.session.info.webId);
-        }
-        return (0, authUtil_1.offlineTestID)(); // null unless testing
-    };
-    /**
-     * Retrieves currently logged in webId from either
-     * defaultTestUser or SolidAuth
-     * Also activates a session after login
-     * @param [setUserCallback] Optional callback
-     * @returns Resolves with webId uri, if no callback provided
-     */
-    SolidAuthnLogic.prototype.checkUser = function (setUserCallback) {
-        return __awaiter(this, void 0, void 0, function () {
-            var preLoginRedirectHash, redirectUrl, postLoginRedirectHash, curUrl, me, webId;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        preLoginRedirectHash = new URL(window.location.href).hash;
-                        if (preLoginRedirectHash) {
-                            window.localStorage.setItem('preLoginRedirectHash', preLoginRedirectHash);
-                        }
-                        this.session.onSessionRestore(function (url) {
-                            if (document.location.toString() !== url)
-                                history.replaceState(null, '', url);
-                        });
-                        redirectUrl = new URL(window.location.href);
-                        redirectUrl.hash = '';
-                        return [4 /*yield*/, this.session
-                                .handleIncomingRedirect({
-                                restorePreviousSession: true,
-                                url: redirectUrl.href
-                            })
-                            // Check to see if a hash was stored in local storage
-                        ];
-                    case 1:
-                        _a.sent();
-                        postLoginRedirectHash = window.localStorage.getItem('preLoginRedirectHash');
-                        if (postLoginRedirectHash) {
-                            curUrl = new URL(window.location.href);
-                            if (curUrl.hash !== postLoginRedirectHash) {
-                                if (history.pushState) {
-                                    // debug.log('Setting window.location.has using pushState')
-                                    history.pushState(null, document.title, postLoginRedirectHash);
-                                }
-                                else {
-                                    // debug.warn('Setting window.location.has using location.hash')
-                                    location.hash = postLoginRedirectHash;
-                                }
-                                curUrl.hash = postLoginRedirectHash;
-                            }
-                            // See https://stackoverflow.com/questions/3870057/how-can-i-update-window-location-hash-without-jumping-the-document
-                            // window.location.href = curUrl.toString()// @@ See https://developer.mozilla.org/en-US/docs/Web/API/Window/location
-                            window.localStorage.setItem('preLoginRedirectHash', '');
-                        }
-                        me = (0, authUtil_1.offlineTestID)();
-                        if (me) {
-                            return [2 /*return*/, Promise.resolve(setUserCallback ? setUserCallback(me) : me)];
-                        }
-                        webId = this.webIdFromSession(this.session.info);
-                        if (webId) {
-                            me = this.saveUser(webId);
-                        }
-                        if (me) {
-                            debug.log("(Logged in as ".concat(me, " by authentication)"));
-                        }
-                        return [2 /*return*/, Promise.resolve(setUserCallback ? setUserCallback(me) : me)];
-                }
-            });
-        });
-    };
-    /**
-     * Saves `webId` in `context.me`
-     * @param webId
-     * @param context
-     *
-     * @returns Returns the WebID, after setting it
-     */
-    SolidAuthnLogic.prototype.saveUser = function (webId, context) {
-        var webIdUri;
-        if (webId) {
-            webIdUri = (typeof webId === 'string') ? webId : webId.uri;
-            var me = (0, rdflib_1.namedNode)(webIdUri);
-            if (context) {
-                context.me = me;
-            }
-            return me;
-        }
-        return null;
-    };
-    /**
-     * @returns {Promise<string|null>} Resolves with WebID URI or null
-     */
-    SolidAuthnLogic.prototype.webIdFromSession = function (session) {
-        var webId = (session === null || session === void 0 ? void 0 : session.webId) && session.isLoggedIn ? session.webId : null;
-        return webId;
-    };
-    return SolidAuthnLogic;
-}());
-exports.SolidAuthnLogic = SolidAuthnLogic;
-//# sourceMappingURL=SolidAuthnLogic.js.map

package/lib/authn/SolidAuthnLogic.js.map

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

package/lib/authn/authUtil.js

@@ -1,105 +0,0 @@
-"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 () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.appContext = void 0;
-exports.offlineTestID = offlineTestID;
-var rdflib_1 = require("rdflib");
-var debug = __importStar(require("../util/debug"));
-/**
- * find a user or app's context as set in window.SolidAppContext
- * this is a const, not a function, because we have problems to jest mock it otherwise
- * see: https://github.com/facebook/jest/issues/936#issuecomment-545080082 for more
- * @return {any} - an appContext object
- */
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-var appContext = function () {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    var SolidAppContext = window.SolidAppContext;
-    SolidAppContext || (SolidAppContext = {});
-    SolidAppContext.viewingNoAuthPage = false;
-    if (SolidAppContext.noAuth && window.document) {
-        var currentPage = window.document.location.href;
-        if (currentPage.startsWith(SolidAppContext.noAuth)) {
-            SolidAppContext.viewingNoAuthPage = true;
-            var params = new URLSearchParams(window.document.location.search);
-            if (params) {
-                var viewedPage = SolidAppContext.viewedPage = params.get('uri') || null;
-                if (viewedPage) {
-                    viewedPage = decodeURI(viewedPage);
-                    if (!viewedPage.startsWith(SolidAppContext.noAuth)) {
-                        var ary = viewedPage.split(/\//);
-                        SolidAppContext.idp = ary[0] + '//' + ary[2];
-                        SolidAppContext.viewingNoAuthPage = false;
-                    }
-                }
-            }
-        }
-    }
-    return SolidAppContext;
-};
-exports.appContext = appContext;
-/**
- * Returns `sym($SolidTestEnvironment.username)` if
- * `$SolidTestEnvironment.username` is defined as a global
- * or
- * returns testID defined in the HTML page
- * @returns {NamedNode|null}
- */
-function offlineTestID() {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any 
-    var $SolidTestEnvironment = window.$SolidTestEnvironment;
-    if (typeof $SolidTestEnvironment !== 'undefined' &&
-        $SolidTestEnvironment.username) {
-        // Test setup
-        debug.log('Assuming the user is ' + $SolidTestEnvironment.username);
-        return (0, rdflib_1.sym)($SolidTestEnvironment.username);
-    }
-    // hack that makes SolidOS work in offline mode by adding the webId directly in html
-    // example usage: https://github.com/solidos/mashlib/blob/29b8b53c46bf02e0e219f0bacd51b0e9951001dd/test/contact/local.html#L37
-    if (typeof document !== 'undefined' &&
-        document.location &&
-        ('' + document.location).slice(0, 16) === 'http://localhost') {
-        var div = document.getElementById('appTarget');
-        if (!div)
-            return null;
-        var id = div.getAttribute('testID');
-        if (!id)
-            return null;
-        debug.log('Assuming user is ' + id);
-        return (0, rdflib_1.sym)(id);
-    }
-    return null;
-}
-//# sourceMappingURL=authUtil.js.map

package/lib/authn/authUtil.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"authUtil.js","sourceRoot":"","sources":["../../src/authn/authUtil.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA2CA,sCA0BC;AArED,iCAAuC;AACvC,mDAAsC;AAEtC;;;;;GAKG;AACH,8DAA8D;AACvD,IAAM,UAAU,GAAG;IACtB,8DAA8D;IACxD,IAAA,eAAe,GAAU,MAAM,gBAAhB,CAAgB;IACrC,eAAe,KAAf,eAAe,GAAK,EAAE,EAAA;IACtB,eAAe,CAAC,iBAAiB,GAAG,KAAK,CAAA;IACzC,IAAI,eAAe,CAAC,MAAM,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;QAC5C,IAAM,WAAW,GAAG,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAA;QACjD,IAAI,WAAW,CAAC,UAAU,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC;YACrD,eAAe,CAAC,iBAAiB,GAAG,IAAI,CAAA;YACxC,IAAM,MAAM,GAAG,IAAI,eAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;YACnE,IAAI,MAAM,EAAE,CAAC;gBACT,IAAI,UAAU,GAAG,eAAe,CAAC,UAAU,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,CAAA;gBACvE,IAAI,UAAU,EAAE,CAAC;oBACjB,UAAU,GAAG,SAAS,CAAC,UAAU,CAAC,CAAA;oBAClC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC;wBACjD,IAAM,GAAG,GAAG,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;wBAClC,eAAe,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,CAAA;wBAC5C,eAAe,CAAC,iBAAiB,GAAG,KAAK,CAAA;oBAC7C,CAAC;gBACD,CAAC;YACL,CAAC;QACD,CAAC;IACL,CAAC;IACD,OAAO,eAAe,CAAA;AAC1B,CAAC,CAAA;AAxBY,QAAA,UAAU,cAwBtB;AAED;;;;;;GAMG;AACH,SAAgB,aAAa;IACzB,+DAA+D;IACvD,IAAA,qBAAqB,GAAU,MAAM,sBAAhB,CAAgB;IAC7C,IACE,OAAO,qBAAqB,KAAK,WAAW;QAC5C,qBAAqB,CAAC,QAAQ,EAC9B,CAAC;QACD,aAAa;QACb,KAAK,CAAC,GAAG,CAAC,uBAAuB,GAAG,qBAAqB,CAAC,QAAQ,CAAC,CAAA;QACnE,OAAO,IAAA,YAAG,EAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAA;IAC5C,CAAC;IACD,oFAAoF;IACpF,8HAA8H;IAC9H,IACE,OAAO,QAAQ,KAAK,WAAW;QAC/B,QAAQ,CAAC,QAAQ;QACjB,CAAC,EAAE,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,kBAAkB,EAC5D,CAAC;QACD,IAAM,GAAG,GAAG,QAAQ,CAAC,cAAc,CAAC,WAAW,CAAC,CAAA;QAChD,IAAI,CAAC,GAAG;YAAE,OAAO,IAAI,CAAA;QACrB,IAAM,EAAE,GAAG,GAAG,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAA;QACrC,IAAI,CAAC,EAAE;YAAE,OAAO,IAAI,CAAA;QACpB,KAAK,CAAC,GAAG,CAAC,mBAAmB,GAAG,EAAE,CAAC,CAAA;QACnC,OAAO,IAAA,YAAG,EAAC,EAAE,CAAC,CAAA;IAChB,CAAC;IACD,OAAO,IAAI,CAAA;AACf,CAAC"}