@muze-nl/od-jsontag 0.4.0 → 0.4.1

package/README.md

@@ -3,31 +3,31 @@
 This library implements a parser and stringifier for a variant of [JSONTag](https://github.com/muze-nl/jsontag/) which is optimized so that you only need to parse objects that you use and skip parsing any other objects.
 This is especially useful to share data between threads or other workers using sharedArrayBuffers, the only shared memory option in javascript currently.
 
-The parse function creates in memory Proxy objects that trigger parsing only when accessed. You can use the data as normal objects for most use-cases. The format supports non-enumerable 
+The parser creates in memory Proxy objects that trigger parsing only when accessed. You can use the data as normal objects for most use-cases. The format supports non-enumerable 
 properties, which aren't part of the normal JSONTag format. The parse function expects an ArrayBuffer a input.
 
 The stringify function creates a sharedArrayBuffer, which represents a file with one object per line. Each line is prefixed with a byte counter that indicates the length of the line. References to other objects are encoded as ~n, where n is the line number (starting at 0).
 
-The parse function doesn't build an id index, because that requires parsing all objects. Instead the stringify function builds or updates the id index. It isn't included in the string result.
+The parser doesn't build an id index, because that requires parsing all objects. Instead the stringify function builds or updates the id index. It isn't included in the string result.
 
 In addition to the normal meta options, as defined in the [JSONTag library](https://github.com/muze-nl/jsontag/), od-jsontag adds the `meta.access` option. This must be a function like:
 
 ```
-meta.access = (object, property, method) => true | false
+parser.meta.access = (object, property, method) => true | false
 ```
 
-If meta.access returns true, access to that property is allowed. Otherwise access is disallowed and the property value returned is `undefined`.
+If `parser.meta.access` returns true, access to that property is allowed. Otherwise access is disallowed and the property value returned is `undefined`.
 
 The `method` parameter is one of `set`,`get`,`has`,`deleteProperty`,`defineProperty`.
 
 Add the access function in the meta parameter of the `parse` method:
 
 ```
-import parse from 'od-jsontag'
-meta = {
-	access: (object, property, method) => {
-		return property=='name'
-	}
+import Parser from 'od-jsontag'
+
+const parser = new Parser()
+parser.meta.access: (object, property, method) => {
+	return property=='name'
 }
-const root = parse(string, meta)
+const root = parser.parse(string)
 ```

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@muze-nl/od-jsontag",
-	"version": "0.4.0",
+	"version": "0.4.1",
 	"description": "On Demand JSONTag: parse/serialize large datastructures on demand, useful for sharing data between threads",
 	"type": "module",
 	"author": "Auke van Slooten <auke@muze.nl>",
@@ -28,7 +28,7 @@
 		"@eslint/js": "^9.36.0",
 		"eslint": "^9.36.0",
 		"globals": "^16.4.0",
-		"tap": "~16.3.7"
+		"tap": "~21.1.0"
 	},
 	"files": [
 		"src/",
@@ -36,6 +36,6 @@
 		"LICENSE"
 	],
 	"dependencies": {
-		"@muze-nl/jsontag": "^0.10.0"
+		"@muze-nl/jsontag": "^0.10.2"
 	}
 }

package/src/parse.mjs

@@ -60,10 +60,22 @@ export default class Parser extends JSONTag.Parser
         this.handlers = {
             newArrayHandler: {
                 get: (target, prop) => {
+                    switch(prop) {
+                        case source:
+                            return target
+                        break
+                        case isProxy:
+                            return true
+                        break
+                        case proxyType:
+                            return 'new'
+                        break
+                    }
                     if (target[prop] instanceof Function) {
                         return (...args) => {
                             args = args.map(arg => {
-                                if (JSONTag.getType(arg)==='object' && !arg[isProxy]) {
+                                const type = JSONTag.getType(arg)
+                                if (type==='object' || type==='link') {
                                     arg = this.getNewValueProxy(arg)
                                 }
                                 return arg
@@ -91,7 +103,10 @@ export default class Parser extends JSONTag.Parser
                     if (this.meta.access && !this.meta.access(target, prop)) {
                         return undefined
                     }
-                    if (JSONTag.getType(value)==='object' && !value[isProxy]) {
+                    const type = JSONTag.getType(arg)
+                    if ((type==='object' || type==='link')
+                        && typeof prop !== 'symbol'
+                    ) {
                         value = this.getNewValueProxy(value)
                     } 
                     target[prop] = value
@@ -143,7 +158,10 @@ export default class Parser extends JSONTag.Parser
                     if (this.meta.access && !this.meta.access(target, prop, 'set')) {
                         return undefined
                     }
-                    if (JSONTag.getType(value)==='object' && !value[isProxy]) {
+                    const type = JSONTag.getType(arg)
+                    if ((type==='object' || type==='link')
+                        && typeof prop !== 'symbol'
+                    ) {
                         value = this.getNewValueProxy(value)
                     }
                     target[prop] = value
@@ -152,17 +170,31 @@ export default class Parser extends JSONTag.Parser
             },
             arrayHandler: {
                 get: (target, prop, receiver) => {
+                    switch(prop) {
+                        case source:
+                            return target
+                        break
+                        case isProxy:
+                            return true
+                        break
+                        case proxyType:
+                            return 'array'
+                        break
+                    }
                     const value = target?.[prop]
                     if (value instanceof Function) {
-                        // if (['copyWithin','fill','pop','push','reverse','shift','sort','splice','unshift'].indexOf(prop)!==-1) {
-                        //     if (immutable) {
-                        //         throw new Error('dataspace is immutable')
-                        //     }
-                        // }
+                        if (['copyWithin','fill','pop','push','reverse','shift','sort','splice','unshift'].indexOf(prop)!==-1) {
+                            if (this.immutable) {
+                                throw new Error('dataspace is immutable')
+                            }
+                        }
                         return (...args) => {
                             args = args.map(arg => {
-                                if (JSONTag.getType(arg)==='object' && !arg[isProxy]) {
-                                    arg = this.getNewValueProxy(arg)
+                                if (!arg[isProxy]) {
+                                    let type = JSONTag.getType(arg)
+                                    if (type==='object' || type==='link') { //FIXME: check if other types need handling
+                                        arg = this.getNewValueProxy(arg)
+                                    }
                                 }
                                 return arg
                             })
@@ -193,7 +225,10 @@ export default class Parser extends JSONTag.Parser
                     if (this.meta.access && !this.meta.access(target, prop, 'set')) {
                         return undefined
                     }
-                    if (JSONTag.getType(value)==='object' && !value[isProxy]) {
+                    const type = JSONTag.getType(value)
+                    if ((type==='object' || type==='link') //FIXME: check if other types need handling
+                        && typeof prop !== 'symbol'
+                    ) {
                         value = this.getNewValueProxy(value)
                     }
                     if (target[prop] === value) {
@@ -294,7 +329,10 @@ export default class Parser extends JSONTag.Parser
                     if (this.meta.access && !this.meta.access(target, prop, 'set')) {
                         return undefined
                     }
-                    if (value && JSONTag.getType(value)==='object' && !value[isProxy]) {
+                    const type = JSONTag.getType(value)
+                    if ((type==='object' || type==='link') //FIXME: check if other types need handling
+                        && typeof prop !== 'symbol'
+                    ) {
                         value = this.getNewValueProxy(value)
                     }
                     if (target[prop] === value) {
@@ -679,10 +717,9 @@ export default class Parser extends JSONTag.Parser
         Object.entries(parent).forEach(([key,entry]) => {
             if (Array.isArray(entry)) {
                 this.makeChildProxies(entry)
-            } else if (entry && JSONTag.getType(entry)==='object') {
-                if (entry[isProxy]) {
-                    // do nothing
-                } else {
+            } else if (entry && !entry[isProxy]) {
+                let type = JSONTag.getType(entry)
+                if (type==='object' || type==='link') {//FIXME: check for other types
                     parent[key] = this.getNewValueProxy(entry)
                 }
             }
@@ -716,6 +753,15 @@ export default class Parser extends JSONTag.Parser
         if (value === null) {
             return null
         }
+        if (value[isProxy]) {
+            return value
+        }
+        if (JSONTag.getType(value)=='link') {
+            let index = this.meta.index.id.get(''+value)
+            if (typeof index != 'undefined') {
+                return this.meta.resultArray[index]
+            }
+        }
         let index = this.meta.resultArray.length
         this.meta.resultArray.push('')
         value[getIndex] = index
@@ -759,10 +805,12 @@ export default class Parser extends JSONTag.Parser
         return this.meta.resultArray[0]
     }
 
-    checkUnresolved() {
+    checkUnresolved(item, object, key) {
         // TODO:
         // for now assume there are no <link> objects in od-jsontag
         // JSONTag Parser.checkUnresolved triggers firstParse, 
         // while parsing the current object
+        // incorrect: when adding a new object from a JSONTag string
+        // it may contain links which cannot yet be resolved... these need to be handled
     }
 }

package/src/serialize.mjs

@@ -16,233 +16,233 @@ function stringToSAB(strData) {
 }
 
 export default function serialize(value, options={}) {
-	let resultArray = false
-	let references = new WeakMap()
+    let resultArray = false
+    let references = new WeakMap()
 
-	if (options.meta) {
-		if (!options.meta.index) {
-			options.meta.index = {}
-		}
-		if (!options.meta.index.id) {
-			options.meta.index.id = new Map()
-		}
-		if (options.meta.resultArray) {
-			resultArray = options.meta.resultArray
-		}
-	}
-	if (!resultArray) {
-		resultArray = value?.[resultSet]
-	}
-	if (!resultArray) {
-		resultArray = []
-	}
+    if (options.meta) {
+        if (!options.meta.index) {
+            options.meta.index = {}
+        }
+        if (!options.meta.index.id) {
+            options.meta.index.id = new Map()
+        }
+        if (options.meta.resultArray) {
+            resultArray = options.meta.resultArray
+        }
+    }
+    if (!resultArray) {
+        resultArray = value?.[resultSet]
+    }
+    if (!resultArray) {
+        resultArray = []
+    }
 
-	function stringifyValue(value, inarray=false, current) {
-		let prop
-		let typeString = JSONTag.getTypeString(value)
-		let type = JSONTag.getType(value)
-		switch (type) {
-			case 'string':
-			case 'decimal':
-			case 'money':
-			case 'link':
-			case 'text':
-			case 'blob':
-			case 'color':
-			case 'email':
-			case 'hash':
-			case 'duration':
-			case 'phone':
-			case 'url':
-			case 'uuid':
-			case 'date':
-			case 'time':
-			case 'datetime':
-				if (JSONTag.isNull(value)) {
-					value = 'null'
-				} else {
-					value = realJSON.stringify(''+value)
-				}
-				prop = typeString + value
-			break
-			case 'int':
-			case 'uint':
-			case 'int8':
-			case 'uint8':
-			case 'int16':
-			case 'uint16':
-			case 'int32':
-			case 'uint32':
-			case 'int64':
-			case 'uint64':
-			case 'float':
-			case 'float32':
-			case 'float64':
-			case 'timestamp':
-			case 'number':
-			case 'boolean':
-				if (JSONTag.isNull(value)) {
-					value = 'null'
-				} else {
-					value = realJSON.stringify(value)
-				}
-				prop = typeString + value
-			break
-			case 'array': 
-				let entries = value.map(e => stringifyValue(e, true, current))
-				let mergedEntries = []
-				let previousIndex = null
-				let startSlice = null
-				entries.forEach(e => {
-					if (e[0]=='~') {
-						let currIndex = parseInt(e.substr(1))
-						if (startSlice && currIndex === (previousIndex + 1)) {
-							mergedEntries.pop()
-							mergedEntries.push('~' + startSlice + '-' + currIndex)
-							previousIndex = currIndex
-						} else {
-							mergedEntries.push(e)
-							previousIndex = currIndex
-							startSlice = currIndex
-						}
-					} else {
-						mergedEntries.push(e)
-						previousIndex = null
-						startSlice = null
-					}
-				})
-				entries = mergedEntries.join(',')
-				prop = typeString + '[' + entries + ']'
-			break
-			case 'object':
-				if (!value) {
-					prop = 'null'
-				} else if (value[isProxy]) {
-					if (inarray) {
-						prop = '~'+value[getIndex]
-					} else {
-						prop = decoder.decode(value[getBuffer](current))
-					}
-				} else {
-					if (!references.has(value)) {
-						references.set(value, resultArray.length)
-						resultArray.push(value)
-					}
-					prop = '~'+references.get(value)
-				}
-			break
-			default:
-				throw new Error(JSONTag.getType(value)+' type not yet implemented')
-			break
-		}
-		return prop
-	}
+    function stringifyValue(value, inarray=false, current) {
+        let prop
+        let typeString = JSONTag.getTypeString(value)
+        let type = JSONTag.getType(value)
+        switch (type) {
+            case 'string':
+            case 'decimal':
+            case 'money':
+            case 'link':
+            case 'text':
+            case 'blob':
+            case 'color':
+            case 'email':
+            case 'hash':
+            case 'duration':
+            case 'phone':
+            case 'url':
+            case 'uuid':
+            case 'date':
+            case 'time':
+            case 'datetime':
+                if (JSONTag.isNull(value)) {
+                    value = 'null'
+                } else {
+                    value = realJSON.stringify(''+value)
+                }
+                prop = typeString + value
+            break
+            case 'int':
+            case 'uint':
+            case 'int8':
+            case 'uint8':
+            case 'int16':
+            case 'uint16':
+            case 'int32':
+            case 'uint32':
+            case 'int64':
+            case 'uint64':
+            case 'float':
+            case 'float32':
+            case 'float64':
+            case 'timestamp':
+            case 'number':
+            case 'boolean':
+                if (JSONTag.isNull(value)) {
+                    value = 'null'
+                } else {
+                    value = realJSON.stringify(value)
+                }
+                prop = typeString + value
+            break
+            case 'array': 
+                let entries = value.map(e => stringifyValue(e, true, current))
+                let mergedEntries = []
+                let previousIndex = null
+                let startSlice = null
+                entries.forEach(e => {
+                    if (e[0]=='~') {
+                        let currIndex = parseInt(e.substr(1))
+                        if (startSlice && currIndex === (previousIndex + 1)) {
+                            mergedEntries.pop()
+                            mergedEntries.push('~' + startSlice + '-' + currIndex)
+                            previousIndex = currIndex
+                        } else {
+                            mergedEntries.push(e)
+                            previousIndex = currIndex
+                            startSlice = currIndex
+                        }
+                    } else {
+                        mergedEntries.push(e)
+                        previousIndex = null
+                        startSlice = null
+                    }
+                })
+                entries = mergedEntries.join(',')
+                prop = typeString + '[' + entries + ']'
+            break
+            case 'object':
+                if (!value) {
+                    prop = 'null'
+                } else if (value[isProxy]) {
+                    if (inarray) {
+                        prop = '~'+value[getIndex]
+                    } else {
+                        prop = decoder.decode(value[getBuffer](current))
+                    }
+                } else {
+                    if (!references.has(value)) {
+                        references.set(value, resultArray.length)
+                        resultArray.push(value)
+                    }
+                    prop = '~'+references.get(value)
+                }
+            break
+            default:
+                throw new Error(JSONTag.getType(value)+' type not yet implemented')
+            break
+        }
+        return prop
+    }
 
-	const encoder = new TextEncoder()
-	const decoder = new TextDecoder()
+    const encoder = new TextEncoder()
+    const decoder = new TextDecoder()
 
-	// is only ever called on object values
-	// and should always return a stringified object, not a reference (~n)
-	const innerStringify = (current) => {
-		let object = resultArray[current]
-		let result 
+    // is only ever called on object values
+    // and should always return a stringified object, not a reference (~n)
+    const innerStringify = (current) => {
+        let object = resultArray[current]
+        let result 
 
-		// if value is a valueProxy, just copy the input slice
-		if (object && !JSONTag.isNull(object) && object[isProxy] && !object[isChanged]) {
-			return decoder.decode(object[getBuffer](current))
-		}
-		if (typeof object === 'undefined' || object === null) {
-			return 'null'
-		}
-		
-		let props = []
-		for (let key of Object.getOwnPropertyNames(object)) {
-			let value = object[key]
-			let prop = stringifyValue(value, false, current)
-			let enumerable = object.propertyIsEnumerable(key) ? '' : '#'
-			props.push(enumerable+realJSON.stringify(key)+':'+prop) //FIXME: how does key get escaped?
-		}
-		result = JSONTag.getTypeString(object)+'{'+props.join(',')+'}'
-		return result
-	}
-		
-	const encode = (s) => {
-		if (typeof s == 'string' || s instanceof String) {
-			s = encoder.encode(s)
-		}
-		if (s[0]==43 || options.skipLength) {
-			return new Uint8Array(s)
-		}
-		let length = encoder.encode('('+s.length+')')
-		let u8arr = new Uint8Array(length.length+s.length)
-		u8arr.set(length, 0)
-		u8arr.set(s, length.length)
-		return u8arr
-	}
+        // if value is a valueProxy, just copy the input slice
+        if (object && !JSONTag.isNull(object) && object[isProxy] && !object[isChanged]) {
+            return decoder.decode(object[getBuffer](current))
+        }
+        if (typeof object === 'undefined' || object === null) {
+            return 'null'
+        }
+        
+        let props = []
+        for (let key of Object.getOwnPropertyNames(object)) {
+            let value = object[key]
+            let prop = stringifyValue(value, false, current)
+            let enumerable = object.propertyIsEnumerable(key) ? '' : '#'
+            props.push(enumerable+realJSON.stringify(key)+':'+prop) //FIXME: how does key get escaped?
+        }
+        result = JSONTag.getTypeString(object)+'{'+props.join(',')+'}'
+        return result
+    }
+        
+    const encode = (s) => {
+        if (typeof s == 'string' || s instanceof String) {
+            s = encoder.encode(s)
+        }
+        if (s[0]==43 || options.skipLength) {
+            return new Uint8Array(s)
+        }
+        let length = encoder.encode('('+s.length+')')
+        let u8arr = new Uint8Array(length.length+s.length)
+        u8arr.set(length, 0)
+        u8arr.set(s, length.length)
+        return u8arr
+    }
 
-	if (!value?.[resultSet]) {
-		resultArray.push(value)
-	}
-	let currentSource = 0
-	let currentResult = 0
-	let skipCount = 0
-	let result = []
-	while(currentSource<resultArray.length) {
-		if (!resultArray[currentSource]) {
-			//FIXME: should not happen, this means that there is no complete
-			//od-jsontag file, only patches?
-			skipCount++
-		} else if (resultArray[currentSource][isChanged] || !resultArray[currentSource][isProxy]) {
-			if (skipCount) {
-				result[currentResult] = encoder.encode('+'+skipCount)
-				skipCount = 0
-				currentResult++
-			}
-			result[currentResult] = encoder.encode(innerStringify(currentSource))
-			if (options.meta) {
-				const id=JSONTag.getAttribute(resultArray[currentSource],'id')
-				if (id) {
-					options.meta.index.id.set(id, currentSource)
-				}
-			}
-			currentResult++
-		} else if (!options.changes) {
-			result[currentResult] = resultArray[currentSource][getBuffer](currentSource)
-			if (options.meta) {
-				const id=JSONTag.getAttribute(resultArray[currentSource],'id')
-				if (id) {
-					options.meta.index.id.set(id, currentSource)
-				}
-			}
-			currentResult++
-		} else {
-			skipCount++
-		}
+    if (!value?.[resultSet]) {
+        resultArray.push(value)
+    }
+    let currentSource = 0
+    let currentResult = 0
+    let skipCount = 0
+    let result = []
+    while(currentSource<resultArray.length) {
+        if (!resultArray[currentSource]) {
+            //FIXME: should not happen, this means that there is no complete
+            //od-jsontag file, only patches?
+            skipCount++
+        } else if (resultArray[currentSource][isChanged] || !resultArray[currentSource][isProxy]) {
+            if (skipCount) {
+                result[currentResult] = encoder.encode('+'+skipCount)
+                skipCount = 0
+                currentResult++
+            }
+            result[currentResult] = encoder.encode(innerStringify(currentSource))
+            if (options.meta) {
+                const id=JSONTag.getAttribute(resultArray[currentSource],'id')
+                if (id) {
+                    options.meta.index.id.set(id, currentSource)
+                }
+            }
+            currentResult++
+        } else if (!options.changes) {
+            result[currentResult] = resultArray[currentSource][getBuffer](currentSource)
+            if (options.meta) {
+                const id=JSONTag.getAttribute(resultArray[currentSource],'id')
+                if (id) {
+                    options.meta.index.id.set(id, currentSource)
+                }
+            }
+            currentResult++
+        } else {
+            skipCount++
+        }
 
-		currentSource++
-	}
-	let arr = result.map(encode)
-	let length = 0
-	for (let line of arr) {
-		length += line.length+1
-	}
-	if (length) {
-		length -= 1 // skip last newline
-	}
-	let sab = new SharedArrayBuffer(length)
-	let u8arr = new Uint8Array(sab)
-	let offset = 0
-	for(let line of arr) {
-		u8arr.set(line, offset)
-		offset+=line.length
-		if (offset<length) {
-			u8arr.set([10], offset)
-			offset++
-		}
-	}
-	return u8arr
+        currentSource++
+    }
+    let arr = result.map(encode)
+    let length = 0
+    for (let line of arr) {
+        length += line.length+1
+    }
+    if (length) {
+        length -= 1 // skip last newline
+    }
+    let sab = new SharedArrayBuffer(length)
+    let u8arr = new Uint8Array(sab)
+    let offset = 0
+    for(let line of arr) {
+        u8arr.set(line, offset)
+        offset+=line.length
+        if (offset<length) {
+            u8arr.set([10], offset)
+            offset++
+        }
+    }
+    return u8arr
 }
 
 export function stringify(buf) {
-	return decoder.decode(buf)
+    return decoder.decode(buf)
 }

package/src/symbols.mjs

@@ -5,7 +5,6 @@ export const getBuffer = Symbol('getBuffer')
 export const getIndex = Symbol('getIndex')
 export const isChanged = Symbol('isChanged')
 export const isParsed = Symbol('isParsed')
-export const isReceived = Symbol('isReceived')
 export const getString = Symbol('getString')
 export const position = Symbol('position')
 export const parent = Symbol('parent')

package/src/jsontag.mjs

@@ -1,91 +0,0 @@
-import JSONTag from '@muze-nl/jsontag'
-import {source, isChanged} from './symbols.mjs'
-
-export function getType(obj) {
-    return JSONTag.getType(obj?.[source] ?? obj)
-}
-
-export function getAttribute(obj, attr) {
-    return JSONTag.getAttribute(obj?.[source] ?? obj, attr)
-}
-
-export function getAttributes(obj) {
-    return JSONTag.getAttributes(obj?.[source] ?? obj)
-}
-
-export function getAttributeString(obj) {
-    return JSONTag.getAttributesString(obj?.[source] ?? obj)
-}
-
-export function getTypeString(obj) {
-    return JSONTag.getTypeString(obj?.[source] ?? obj)
-}
-
-export function isNull(obj) {
-    return JSONTag.isNull(obj?.[source] ?? obj)
-}
-
-export function setAttribute(obj, attr, value) {
-    if (obj?.[source]) {
-        obj[isChanged] = true
-        // const info = globalThis.JSONTagTypeInfo.get(obj[source])
-        // if (!info) {
-        //     info = {}
-        //     globalThis.JSONTagTypeInfo.set(obj[source], info)
-        // }
-        // globalThis.JSONTagTypeInfo.set(obj, info)
-    }
-    return JSONTag.setAttribute(obj?.[source] ?? obj, attr, value)
-}
-
-export function setAttributes(obj, attr) {
-    if (obj?.[source]) {
-        obj[isChanged] = true
-        // const info = globalThis.JSONTagTypeInfo.get(obj[source])
-        // if (!info) {
-        //     info = {}
-        //     globalThis.JSONTagTypeInfo.set(obj[source], info)
-        // }
-        // globalThis.JSONTagTypeInfo.set(obj, info)
-    }
-    return JSONTag.setAttribute(obj?.[source] ?? obj, attr)
-}
-
-export function setType(obj, type) {
-    if (obj?.[source]) {
-        obj[isChanged] = true
-        // const info = globalThis.JSONTagTypeInfo.get(obj[source])
-        // if (!info) {
-        //     info = {}
-        //     globalThis.JSONTagTypeInfo.set(obj[source], info)
-        // }
-        // globalThis.JSONTagTypeInfo.set(obj, info)
-    }
-    return JSONTag.setType(obj?.[source] ?? obj, type)
-}
-
-export function addAttribute(obj, attr, value) {
-    if (obj?.[source]) {
-        obj[isChanged] = true
-        // const info = globalThis.JSONTagTypeInfo.get(obj[source])
-        // if (!info) {
-        //     info = {}
-        //     globalThis.JSONTagTypeInfo.set(obj[source], info)
-        // }
-        // globalThis.JSONTagTypeInfo.set(obj, info)
-    }
-    return JSONTag.addAttribute(obj?.[source] ?? obj, attr, value)
-}
-
-export function removeAttribute(obj, attr) {
-    if (obj?.[source]) {
-        obj[isChanged] = true
-        // const info = globalThis.JSONTagTypeInfo.get(obj[source])
-        // if (!info) {
-        //     info = {}
-        //     globalThis.JSONTagTypeInfo.set(obj[source], info)
-        // }
-        // globalThis.JSONTagTypeInfo.set(obj, info)
-    }
-    return JSONTag.removeAttribute(obj?.[source] ?? obj, attr)
-}