@noeldemartin/solid-utils 0.3.0 → 0.4.0-next.088119819f89e5ceabdc6c32a91004b4f85c7fd7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@noeldemartin/solid-utils",
-  "version": "0.3.0",
+  "version": "0.4.0-next.088119819f89e5ceabdc6c32a91004b4f85c7fd7",
   "description": "My JavaScript utilities for Solid",
   "main": "dist/noeldemartin-solid-utils.cjs.js",
   "module": "dist/noeldemartin-solid-utils.esm.js",
@@ -33,10 +33,9 @@
     "@babel/runtime": "^7.14.0",
     "@noeldemartin/faker": "^7.6.0",
     "@noeldemartin/solid-utils-external": "^0.1.1",
-    "@noeldemartin/utils": "^0.4.0",
+    "@noeldemartin/utils": "^0.5.1",
     "@types/rdf-js": "^4.0.1",
     "core-js": "^3.12.1",
-    "jest-diff": "^26.6.2",
     "md5": "^2.3.0"
   },
   "devDependencies": {
@@ -55,7 +54,6 @@
     "@rollup/plugin-typescript": "^8.2.1",
     "@types/chai": "^4.2.18",
     "@types/jest": "^26.0.23",
-    "@types/jest-diff": "^24.3.0",
     "@types/md5": "^2.3.0",
     "babel-plugin-transform-remove-imports": "^1.5.4",
     "eslint": "^7.26.0",

package/src/helpers/auth.ts

@@ -9,7 +9,7 @@ import type { Fetch } from './io';
 
 export interface SolidUserProfile {
     webId: string;
-    storageUrls: string[];
+    storageUrls: [string, ...string[]];
     cloaked: boolean;
     writableProfileUrl: string | null;
     name?: string;
@@ -106,11 +106,15 @@ async function fetchUserProfile(webId: string, fetch?: Fetch): Promise<SolidUser
         parentUrl = urlParentDirectory(parentUrl);
     }
 
+    if (storageUrls.length === 0) {
+        throw new Error(`Could not find any storage for ${webId}.`);
+    }
+
     return {
         webId,
         cloaked,
         writableProfileUrl,
-        storageUrls: arrayUnique(storageUrls),
+        storageUrls: arrayUnique(storageUrls) as [string, ...string[]],
         ...objectWithoutEmpty({
             name:
                 store.statement(webId, 'vcard:fn')?.object.value ??

package/src/helpers/interop.ts

@@ -44,12 +44,15 @@ async function createTypeIndex(user: SolidUserProfile, type: TypeIndexType, fetc
     ]);
 
     if (type === 'public') {
-        // TODO Implement updating ACLs for the listing itself to public
+        // TODO This is currently implemented in soukai-solid.
     }
 
     return typeIndexUrl;
 }
 
+/**
+ * @deprecated Use soukai-solid instead
+ */
 async function findRegistrations(
     typeIndexUrl: string,
     type: string | string[],
@@ -70,14 +73,23 @@ async function findRegistrations(
     ).flat();
 }
 
+/**
+ * @deprecated Use soukai-solid instead
+ */
 export async function createPublicTypeIndex(user: SolidUserProfile, fetch?: Fetch): Promise<string> {
     return createTypeIndex(user, 'public', fetch);
 }
 
+/**
+ * @deprecated Use soukai-solid instead
+ */
 export async function createPrivateTypeIndex(user: SolidUserProfile, fetch?: Fetch): Promise<string> {
     return createTypeIndex(user, 'private', fetch);
 }
 
+/**
+ * @deprecated Use soukai-solid instead
+ */
 export async function findContainerRegistrations(
     typeIndexUrl: string,
     type: string | string[],
@@ -86,6 +98,9 @@ export async function findContainerRegistrations(
     return findRegistrations(typeIndexUrl, type, 'solid:instanceContainer', fetch);
 }
 
+/**
+ * @deprecated Use soukai-solid instead
+ */
 export async function findInstanceRegistrations(
     typeIndexUrl: string,
     type: string | string[],

package/src/testing/faking.ts

@@ -16,9 +16,11 @@ export interface ResourceOptions extends DocumentOptions {
 }
 
 export function fakeContainerUrl(options: Partial<ContainerOptions> = {}): string {
+    const containerSlug = stringToSlug(faker.random.word());
     const baseUrl = options.baseUrl ?? faker.internet.url();
+    const parentContainerUrl = baseUrl.endsWith('/') ? baseUrl : baseUrl + '/';
 
-    return baseUrl.endsWith('/') ? baseUrl : baseUrl + '/';
+    return parentContainerUrl + containerSlug + '/';
 }
 
 export function fakeDocumentUrl(options: Partial<DocumentOptions> = {}): string {

package/src/testing/mocking.ts

@@ -1,5 +1,5 @@
 import { fail } from '@noeldemartin/utils';
-import type { GetClosureArgs, GetClosureResult } from '@noeldemartin/utils';
+import type { GetClosureArgs } from '@noeldemartin/utils';
 
 import type { Fetch } from '@/helpers/io';
 
@@ -10,9 +10,8 @@ export interface FetchMockMethods {
     mockNotFoundResponse(): void;
 }
 
-export type FetchMock = jest.Mock<GetClosureResult<Fetch>, GetClosureArgs<Fetch>> & Fetch & FetchMockMethods;
-
-export function mockFetch(): FetchMock {
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export function mockFetch<T = any>(): T {
     const responses: ResponseStub[] = [];
     const methods: FetchMockMethods = {
         mockResponse(body, headers, status) {
@@ -30,5 +29,5 @@ export function mockFetch(): FetchMock {
 
     Object.assign(fetchMock, methods);
 
-    return fetchMock as FetchMock;
+    return fetchMock as unknown as T;
 }

package/.semaphore/semaphore.yml

@@ -1,26 +0,0 @@
-version: v1.0
-name: Solid Utils
-agent:
-  machine:
-    type: e1-standard-2
-    os_image: ubuntu1804
-blocks:
-  - name: CI
-    task:
-      prologue:
-        commands:
-          - checkout
-          - nvm install
-          - cache restore
-          - npm ci
-          - cache store
-      jobs:
-        - name: Linting
-          commands:
-            - npm run lint
-        - name: Tests
-          commands:
-            - npm test
-        - name: Build
-          commands:
-            - npm run build