refactor: consistently mark only V2 in names

Author: ca-d

convertEdit.ts

@@ -7,15 +7,15 @@ import {
 } from './editv1.js';
 
 import {
-  Attributes,
+  AttributesV2,
   AttributesNS,
   EditV2,
   isInsert,
   isRemove,
 } from './editv2.js';
 
 function convertUpdate(edit: Update): EditV2 {
-  const attributes: Attributes = {};
+  const attributes: AttributesV2 = {};
   const attributesNS: AttributesNS = {};
 
   Object.entries(edit.attributes).forEach(([key, value]) => {

editv1.ts

@@ -7,7 +7,7 @@ export type NamespacedAttributeValue = {
 
 export type AttributeValue = string | null | NamespacedAttributeValue;
 
-export type AttributesV1 = Partial<Record<string, AttributeValue>>;
+export type Attributes = Partial<Record<string, AttributeValue>>;
 
 /** Intent to set or remove (if null) attributes on element */
 export type Update = {
@@ -31,9 +31,7 @@ export function isNamespaced(
   );
 }
 
-export function isAttributesV1(
-  attributes: unknown,
-): attributes is AttributesV1 {
+export function isAttributes(attributes: unknown): attributes is Attributes {
   if (attributes === null || typeof attributes !== 'object') {
     return false;
   }
@@ -52,7 +50,7 @@ export function isComplexEdit(edit: unknown): edit is Edit[] {
 export function isUpdate(edit: unknown): edit is Update {
   return (
     (edit as Update).element instanceof Element &&
-    isAttributesV1((edit as Update).attributes)
+    isAttributes((edit as Update).attributes)
   );
 }
 

editv2.ts

@@ -17,16 +17,16 @@ export type SetTextContent = {
 };
 
 /** Record from attribute names to attribute values */
-export type Attributes = Partial<Record<string, string | null>>;
+export type AttributesV2 = Partial<Record<string, string | null>>;
 
 /** Record from namespace URIs to `Attributes` records */
-export type AttributesNS = Partial<Record<string, Attributes>>;
+export type AttributesNS = Partial<Record<string, AttributesV2>>;
 
 /** Intent to set or remove (if `null`) `attributes`(-`NS`) on `element` */
 export type SetAttributes = {
   element: Element;
-  attributes: Attributes;
-  attributesNS: AttributesNS;
+  attributes?: AttributesV2;
+  attributesNS?: AttributesNS;
 };
 
 /** Intent to change some XMLDocuments */
@@ -37,7 +37,9 @@ export type EditV2 =
   | Remove
   | EditV2[];
 
-export function isAttributes(attributes: unknown): attributes is Attributes {
+export function isAttributesV2(
+  attributes: unknown,
+): attributes is AttributesV2 {
   if (typeof attributes !== 'object' || attributes === null) {
     return false;
   }
@@ -56,7 +58,7 @@ export function isAttributesNS(
   return Object.entries(attributesNS).every(
     ([namespace, attributes]) =>
       typeof namespace === 'string' &&
-      isAttributes(attributes as Record<string, string | null>),
+      isAttributesV2(attributes as Record<string, string | null>),
   );
 }
 
@@ -81,7 +83,7 @@ export function isRemove(edit: unknown): edit is Remove {
 export function isSetAttributes(edit: unknown): edit is SetAttributes {
   return (
     (edit as SetAttributes).element instanceof Element &&
-    isAttributes((edit as SetAttributes).attributes) &&
+    isAttributesV2((edit as SetAttributes).attributes) &&
     isAttributesNS((edit as SetAttributes).attributesNS)
   );
 }

oscd-api.ts

@@ -1,5 +1,5 @@
 export type {
-  Attributes,
+  AttributesV2,
   AttributesNS,
   EditV2,
   Insert,
@@ -9,7 +9,7 @@ export type {
 } from './editv2.js';
 
 export type {
-  AttributesV1,
+  Attributes,
   AttributeValue,
   Edit,
   NamespacedAttributeValue,

utils.ts

@@ -1,5 +1,5 @@
 export {
-  isAttributes,
+  isAttributesV2,
   isAttributesNS,
   isComplexEditV2,
   isEditV2,
@@ -10,7 +10,7 @@ export {
 } from './editv2.js';
 
 export {
-  isAttributesV1,
+  isAttributes,
   isComplexEdit,
   isEdit,
   isNamespaced,