Feature: Added touch to JS interface. Fixed some consistency issues

Author: Dexagod

src/commands/solid-list.ts

@@ -1,7 +1,5 @@
 import { isDirectory, checkHeadersForAclAndMetadata, getResourceInfoFromDataset, getResourceInfoFromHeaders, ResourceInfo } from '../utils/util';
 import { getContainedResourceUrlAll, getSolidDataset } from '@inrupt/solid-client';
-import type { Logger } from '../logger';
-import BashlibError from '../utils/errors/BashlibError';
 import { ICommandOptions, setOptionDefaults } from './solid-command';
 
 export interface ICommandOptionsList extends ICommandOptions{

src/commands/solid-mkdir.ts

@@ -1,13 +1,21 @@
+import { ResourceInfo } from './../utils/util';
 import { createContainerAt } from '@inrupt/solid-client';
 import type { Logger } from '../logger';
 import { ICommandOptions, setOptionDefaults } from './solid-command';
 
+const LDP = "http://www.w3.org/ns/ldp#";
+
 export interface ICommandOptionsMakeDirectory extends ICommandOptions { }
 
 export default async function makeDirectory(url: string, options: ICommandOptionsMakeDirectory) {
   let commandOptions = setOptionDefaults<ICommandOptionsMakeDirectory>(options);
-  
-  let info = await createContainerAt(url, { fetch: commandOptions.fetch });
+  let container = await createContainerAt(url, { fetch: commandOptions.fetch });
+  let info: ResourceInfo = {
+    url,
+    isDir: true,
+    modified: new Date(),
+    types: [LDP+"Container", LDP+"BasicContainer", LDP+"Resource"],
+  }
   if (commandOptions.verbose) commandOptions.logger.log(`Container successfully created at ${url}`);
   return info
 }

src/commands/solid-perms.ts

@@ -99,7 +99,9 @@ export interface IPermissionOperation {
 }
 
 export async function changePermissions(resourceUrl: string, operations: IPermissionOperation[], options: ICommandOptionsPermissions) {
-  const resourceInfo = await getResourceInfoWithAcl(resourceUrl, { fetch: options.fetch })
+  let commandOptions = setOptionDefaults<ICommandOptionsPermissions>(options);
+
+  const resourceInfo = await getResourceInfoWithAcl(resourceUrl, { fetch: commandOptions.fetch })
   let aclDataset : AclDataset | null;
   if (await hasResourceAcl(resourceInfo)) {
     aclDataset = await getResourceAcl(resourceInfo); 
@@ -148,21 +150,23 @@ export async function changePermissions(resourceUrl: string, operations: IPermis
       if (operation.default) aclDataset = await setPublicDefaultAccess(aclDataset, access)
       aclDataset = await setPublicResourceAccess(aclDataset, access)
     } else { 
-      if (options.verbose) writeErrorString("Incorrect operation type", 'Please provide an operation type of agent, group or public.', options)
+      if (commandOptions.verbose) writeErrorString("Incorrect operation type", 'Please provide an operation type of agent, group or public.', commandOptions)
     }
   }
   // Post updated acl to pod
   if (aclDataset && await hasAccessibleAcl(resourceInfo)) {
     await saveAclFor(resourceInfo as WithAccessibleAcl, aclDataset, {fetch: options.fetch})
-    if (options.verbose) (options.logger || console).log(`Updated permissions for: ${resourceUrl}`)
+    if (commandOptions.verbose) commandOptions.logger.log(`Updated permissions for: ${resourceUrl}`)
   }
 }
 
 export async function deletePermissions(resourceUrl: string, options: ICommandOptionsPermissions) {
-  let resourceInfo = await getResourceInfoWithAcl(resourceUrl, {fetch: options.fetch})
+  let commandOptions = setOptionDefaults<ICommandOptionsPermissions>(options);
+
+  let resourceInfo = await getResourceInfoWithAcl(resourceUrl, {fetch: commandOptions.fetch})
   if (hasAccessibleAcl(resourceInfo)) {
-    await deleteAclFor(resourceInfo, {fetch: options.fetch})
-    if (options.verbose) (options.logger || console).log(`Deleted resource at ${resourceUrl}`)
+    await deleteAclFor(resourceInfo, {fetch: commandOptions.fetch})
+    if (commandOptions.verbose) commandOptions.logger.log(`Deleted resource at ${resourceUrl}`)
   } else {
     throw Error(`Resource at ${resourceUrl} does not have an accessible ACL resource`)
   }

src/index.ts

@@ -5,7 +5,8 @@ import remove, {ICommandOptionsRemove} from "./commands/solid-remove"
 import move, {ICommandOptionsMove} from "./commands/solid-move"
 import find, {ICommandOptionsFind} from "./commands/solid-find"
 import query, {ICommandOptionsQuery} from './commands/solid-query'
-import makeDirectory, {ICommandOptionsMakeDirectory} from "./commands/solid-mkdir"
+import makeDirectory, { ICommandOptionsMakeDirectory } from "./commands/solid-mkdir"
+import touch, {ICommandOptionsTouch} from "./commands/solid-touch"
 // import shell from "./commands/solid-shell"
 import createSolidPods, {IAccountData} from "./commands/solid-pod-create"
 import { listPermissions, changePermissions, deletePermissions, ICommandOptionsPermissions, IPermissionOperation, IPermissionListing, Record } from './commands/solid-perms'
@@ -14,7 +15,7 @@ import { generateCSSToken, IClientCredentialsTokenGenerationOptions, CSSToken }
 import { FileInfo, ResourceInfo } from './utils/util';
 
 // General Solid functionality
-export { copy, list, remove, move, find, query, listPermissions, changePermissions, deletePermissions, makeDirectory }
+export { copy, list, remove, move, find, query, listPermissions, changePermissions, deletePermissions, makeDirectory, touch }
 
 // Authentication Functionality
 export { authenticateWithTokenFromJavascript as authenticateToken, generateCSSToken }
@@ -26,7 +27,7 @@ export { createSolidPods }
 export type { Logger } from './logger';
 
 // Type exports of commands options
-export type { ICommandOptionsCopy, ICommandOptionsList, ICommandOptionsRemove, ICommandOptionsMove, ICommandOptionsFind, ICommandOptionsQuery, ICommandOptionsPermissions, ICommandOptionsMakeDirectory }
+export type { ICommandOptionsCopy, ICommandOptionsList, ICommandOptionsRemove, ICommandOptionsMove, ICommandOptionsFind, ICommandOptionsQuery, ICommandOptionsPermissions, ICommandOptionsMakeDirectory, ICommandOptionsTouch }
 
 // Type exports 
 export type { IAccountData, IClientCredentialsTokenGenerationOptions, CSSToken, IPermissionOperation, FileInfo, ResourceInfo, SessionInfo, IPermissionListing, Record }